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

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

Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8

20 files changed, 417 insertions, 417 deletions

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 0d1399a7f085..b5690e80ed9e 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -145,7 +145,7 @@ 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_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, const SfxPoolItem& rHt,
                                      sal_uInt16 nMode );
 static Writer& OutCSS1_SvxFormatBreak_SwFormatPDesc_SvxFormatKeep( Writer& rWrt,
                                         const SfxItemSet& rItemSet,
@@ -1713,10 +1713,10 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc,
     // only export Portrait oder Landscape. Otherwise export size.
     bool bRefLandscape = pRefPageDesc && pRefPageDesc->GetLandscape();
     Size aRefSz;
-    const Size& rSz = rPageDesc.GetMaster().GetFrmSize().GetSize();
+    const Size& rSz = rPageDesc.GetMaster().GetFrameSize().GetSize();
     if( pRefPageDesc )
     {
-        aRefSz = pRefPageDesc->GetMaster().GetFrmSize().GetSize();
+        aRefSz = pRefPageDesc->GetMaster().GetFrameSize().GetSize();
         if( bRefLandscape != rPageDesc.GetLandscape() )
         {
             long nTmp = aRefSz.Height();
@@ -1960,7 +1960,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
 }
 
 void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat,
-                                          sal_uInt32 nFrmOpts,
+                                          sal_uInt32 nFrameOpts,
                                           const SdrObject *pSdrObj,
                                           const SfxItemSet *pItemSet )
 {
@@ -1971,7 +1971,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
     const SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
     SvxLRSpaceItem aLRItem( rFrameFormat.GetLRSpace() );
     SvxULSpaceItem aULItem( rFrameFormat.GetULSpace() );
-    if( nFrmOpts & HTML_FRMOPT_S_ALIGN )
+    if( nFrameOpts & HTML_FRMOPT_S_ALIGN )
     {
         const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
         switch( rAnchor.GetAnchorId() )
@@ -1981,7 +1981,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
             if( text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
                 text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
             {
-                if( !(nFrmOpts & HTML_FRMOPT_ALIGN) )
+                if( !(nFrameOpts & HTML_FRMOPT_ALIGN) )
                 {
                     // float
                     const sal_Char *pStr = text::HoriOrientation::RIGHT==rHoriOri.GetHoriOrient()
@@ -2072,7 +2072,7 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
     }
 
     // width/height
-    if( nFrmOpts & HTML_FRMOPT_S_SIZE )
+    if( nFrameOpts & HTML_FRMOPT_S_SIZE )
     {
         if( RES_DRAWFRMFMT == rFrameFormat.Which() )
         {
@@ -2083,17 +2083,17 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
             if( pSdrObj )
             {
                 Size aTwipSz( pSdrObj->GetLogicRect().GetSize() );
-                if( nFrmOpts & HTML_FRMOPT_S_WIDTH )
+                if( nFrameOpts & HTML_FRMOPT_S_WIDTH )
                 {
-                    if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
+                    if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE )
                         OutCSS1_PixelProperty( sCSS1_P_width, aTwipSz.Width(),
                                                false );
                     else
                         OutCSS1_UnitProperty( sCSS1_P_width, aTwipSz.Width() );
                 }
-                if( nFrmOpts & HTML_FRMOPT_S_HEIGHT )
+                if( nFrameOpts & HTML_FRMOPT_S_HEIGHT )
                 {
-                    if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
+                    if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE )
                         OutCSS1_PixelProperty( sCSS1_P_height, aTwipSz.Height(),
                                                true );
                     else
@@ -2103,25 +2103,25 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
         }
         else
         {
-            OSL_ENSURE( HTML_FRMOPT_ABSSIZE & nFrmOpts,
+            OSL_ENSURE( HTML_FRMOPT_ABSSIZE & nFrameOpts,
                     "Export absolute size" );
-            OSL_ENSURE( HTML_FRMOPT_ANYSIZE & nFrmOpts,
+            OSL_ENSURE( HTML_FRMOPT_ANYSIZE & nFrameOpts,
                     "Export every size" );
             sal_uInt16 nMode = 0;
-            if( nFrmOpts & HTML_FRMOPT_S_WIDTH )
+            if( nFrameOpts & HTML_FRMOPT_S_WIDTH )
                 nMode |= CSS1_FRMSIZE_WIDTH;
-            if( nFrmOpts & HTML_FRMOPT_S_HEIGHT )
+            if( nFrameOpts & HTML_FRMOPT_S_HEIGHT )
                 nMode |= (CSS1_FRMSIZE_MINHEIGHT|CSS1_FRMSIZE_FIXHEIGHT);
-            if( nFrmOpts & HTML_FRMOPT_S_PIXSIZE )
+            if( nFrameOpts & HTML_FRMOPT_S_PIXSIZE )
                 nMode |= CSS1_FRMSIZE_PIXEL;
 
-            OutCSS1_SwFormatFrmSize( *this, rFrameFormat.GetFrmSize(), nMode );
+            OutCSS1_SwFormatFrameSize( *this, rFrameFormat.GetFrameSize(), nMode );
         }
     }
 
     const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
     // margin-*
-    if( (nFrmOpts & HTML_FRMOPT_S_SPACE) &&
+    if( (nFrameOpts & HTML_FRMOPT_S_SPACE) &&
         IsHTMLMode( HTMLMODE_FLY_MARGINS) )
     {
         const SvxLRSpaceItem *pLRItem = nullptr;
@@ -2135,17 +2135,17 @@ void SwHTMLWriter::OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat
     }
 
     // border
-    if( nFrmOpts & HTML_FRMOPT_S_BORDER )
+    if( nFrameOpts & HTML_FRMOPT_S_BORDER )
     {
         const SfxPoolItem* pItem;
-        if( nFrmOpts & HTML_FRMOPT_S_NOBORDER )
+        if( nFrameOpts & HTML_FRMOPT_S_NOBORDER )
             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 )
+    if( nFrameOpts & HTML_FRMOPT_S_BACKGROUND )
         OutCSS1_FrameFormatBackground( rFrameFormat );
 
     if( pItemSet )
@@ -2919,12 +2919,12 @@ static Writer& OutCSS1_SwFormatDrop( Writer& rWrt, const SfxPoolItem& rHt )
     return rWrt;
 }
 
-static Writer& OutCSS1_SwFormatFrmSize( Writer& rWrt, const SfxPoolItem& rHt,
+static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, const SfxPoolItem& rHt,
                                      sal_uInt16 nMode )
 {
     SwHTMLWriter& rHTMLWrt = static_cast<SwHTMLWriter&>(rWrt);
 
-    const SwFormatFrmSize& rFSItem = static_cast<const SwFormatFrmSize&>(rHt);
+    const SwFormatFrameSize& rFSItem = static_cast<const SwFormatFrameSize&>(rHt);
 
     if( nMode & CSS1_FRMSIZE_WIDTH )
     {
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 7b644865b823..97b9248297ee 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -868,7 +868,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat,
     sal_uInt16 nDir = rHWrt.GetHTMLDirection(
             (pNodeItemSet ? static_cast < const SvxFrameDirectionItem& >(
                                     pNodeItemSet->Get( RES_FRAMEDIR ) )
-                          : rFormat.GetFrmDir() ).GetValue() );
+                          : rFormat.GetFrameDir() ).GetValue() );
 
     // Ein <P> wird nur geschrieben, wenn
     // - wir in keiner OL/UL/DL sind, oder
@@ -2063,7 +2063,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
         rHTMLWrt.ChangeParaToken( 0 );
 
         // Alle an dem Node verankerten Rahmen ausgeben
-        rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY );
+        rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY );
 
         if( rHTMLWrt.m_bLFPossible )
             rHTMLWrt.OutNewLine(); // Absatz-Tag in eine neue Zeile
@@ -2089,7 +2089,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
                 const SwFrameFormat& rPgFormat =
                     rHTMLWrt.pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool
                     ( RES_POOLPAGE_HTML, false )->GetMaster();
-                const SwFormatFrmSize& rSz   = rPgFormat.GetFrmSize();
+                const SwFormatFrameSize& rSz   = rPgFormat.GetFrameSize();
                 const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
                 const SwFormatCol& rCol = rPgFormat.GetCol();
 
@@ -2104,7 +2104,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
                     const SwTableBox* pBox = pTableNd->GetTable().GetTableBox(
                                     pNd->StartOfSectionIndex() );
                     if( pBox )
-                        nPageWidth = pBox->GetFrameFormat()->GetFrmSize().GetWidth();
+                        nPageWidth = pBox->GetFrameFormat()->GetFrameSize().GetWidth();
                 }
 
                 OString sWidth = OString::number(SwHTMLWriter::ToPixel(nPageWidth - nLeft - nRight, false));
@@ -2176,7 +2176,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
                 rHTMLWrt.m_bLFPossible = !rHTMLWrt.m_nLastParaToken;
 
                 // Alle an dem Node verankerten Rahmen ausgeben
-                rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_ANY );
+                rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_ANY );
                 rHTMLWrt.m_bLFPossible = false;
 
                 return rWrt;
@@ -2229,13 +2229,13 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
     rHTMLWrt.OutForm();
 
     // An dem Node "verankerte" Seitenegebunde Rahmen ausgeben
-    bool bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_PREFIX );
+    bool bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_PREFIX );
 
     // An dem Node verankerte Rahmen ausgeben, die vor dem
     // Absatz-Tag geschrieben werden sollen.
     if( bFlysLeft )
     {
-        bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(), 0, HTML_POS_BEFORE );
+        bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), 0, HTML_POS_BEFORE );
     }
 
     if( rHTMLWrt.pCurPam->GetPoint()->nNode == rHTMLWrt.pCurPam->GetMark()->nNode )
@@ -2402,7 +2402,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
             if( bFlysLeft )
             {
                 aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext );
-                bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(),
+                bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(),
                                                 nStrPos, HTML_POS_INSIDE,
                                                 &aContext );
             }
@@ -2562,7 +2562,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode )
 
     // Die an der letzten Position verankerten Rahmen ausgeben
     if( bFlysLeft )
-        bFlysLeft = rHTMLWrt.OutFlyFrm( rNode.GetIndex(),
+        bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(),
                                        nEnd, HTML_POS_INSIDE );
     OSL_ENSURE( !bFlysLeft, "Es wurden nicht alle Rahmen gespeichert!" );
 
@@ -2900,9 +2900,9 @@ static Writer& OutHTML_SwFlyCnt( Writer& rWrt, const SfxPoolItem& rHt )
     const SwFrameFormat& rFormat = *rFlyCnt.GetFrameFormat();
     const SdrObject *pSdrObj = nullptr;
 
-    SwHTMLFrmType eType =
-        (SwHTMLFrmType)rHTMLWrt.GuessFrmType( rFormat, pSdrObj );
-    sal_uInt8 nMode = aHTMLOutFrmAsCharTable[eType][rHTMLWrt.m_nExportMode];
+    SwHTMLFrameType eType =
+        (SwHTMLFrameType)rHTMLWrt.GuessFrameType( rFormat, pSdrObj );
+    sal_uInt8 nMode = aHTMLOutFrameAsCharTable[eType][rHTMLWrt.m_nExportMode];
     rHTMLWrt.OutFrameFormat( nMode, rFormat, pSdrObj );
     return rWrt;
 }
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index addae9ddf749..291856442520 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -385,8 +385,8 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
 {
     SvxBrushItem aBrushItem( RES_BACKGROUND );
     SvxBoxItem aBoxItem( RES_BOX );
-    SvxFrameDirectionItem aFrmDirItem(FRMDIR_ENVIRONMENT, RES_FRAMEDIR);
-    bool bSetBrush = pBrush!=nullptr, bSetBox = false, bSetFrmDir = false;
+    SvxFrameDirectionItem aFrameDirItem(FRMDIR_ENVIRONMENT, RES_FRAMEDIR);
+    bool bSetBrush = pBrush!=nullptr, bSetBox = false, bSetFrameDir = false;
     if( pBrush )
         aBrushItem = *pBrush;
 
@@ -413,13 +413,13 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
         if( SfxItemState::SET == pItemSet2->GetItemState( RES_FRAMEDIR, false, &pItem ) )
         {
             // eine Umrandung wird gesetzt
-            aFrmDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem );
+            aFrameDirItem = *static_cast< const SvxFrameDirectionItem *>( pItem );
             pItemSet2->ClearItem( RES_FRAMEDIR );
-            bSetFrmDir = true;
+            bSetFrameDir = true;
         }
     }
 
-    if( bSetBrush || bSetBox || bSetFrmDir )
+    if( bSetBrush || bSetBox || bSetFrameDir )
     {
         static sal_uInt16 aPoolIds[] = { RES_POOLPAGE_HTML, RES_POOLPAGE_FIRST,
                                      RES_POOLPAGE_LEFT, RES_POOLPAGE_RIGHT };
@@ -434,8 +434,8 @@ void SwCSS1Parser::SetPageDescAttrs( const SvxBrushItem *pBrush,
                     rMaster.SetFormatAttr( aBrushItem );
                 if( bSetBox )
                     rMaster.SetFormatAttr( aBoxItem );
-                if( bSetFrmDir )
-                    rMaster.SetFormatAttr( aFrmDirItem );
+                if( bSetFrameDir )
+                    rMaster.SetFormatAttr( aFrameDirItem );
 
                 ChgPageDesc( pPageDesc, aNewPageDesc );
             }
@@ -512,7 +512,7 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     {
         if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP )
         {
-            rMaster.SetFormatAttr( SwFormatFrmSize( ATT_FIX_SIZE, rPropInfo.nWidth,
+            rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.nWidth,
                                            rPropInfo.nHeight ) );
             bChanged = true;
         }
@@ -522,17 +522,17 @@ 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.
-            SwFormatFrmSize aFrmSz( rMaster.GetFrmSize() );
+            SwFormatFrameSize aFrameSz( rMaster.GetFrameSize() );
             bool bLandscape = aNewPageDesc.GetLandscape();
             if( ( bLandscape &&
                   rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
                 ( !bLandscape &&
                   rPropInfo.eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) )
             {
-                SwTwips nTmp = aFrmSz.GetHeight();
-                aFrmSz.SetHeight( aFrmSz.GetWidth() );
-                aFrmSz.SetWidth( nTmp );
-                rMaster.SetFormatAttr( aFrmSz );
+                SwTwips nTmp = aFrameSz.GetHeight();
+                aFrameSz.SetHeight( aFrameSz.GetWidth() );
+                aFrameSz.SetWidth( nTmp );
+                rMaster.SetFormatAttr( aFrameSz );
                 aNewPageDesc.SetLandscape( !bLandscape );
                 bChanged = true;
             }
@@ -1943,7 +1943,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
 
 void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
                                            const SvxCSS1PropertyInfo &rPropInfo,
-                                           SfxItemSet &rFrmItemSet )
+                                           SfxItemSet &rFrameItemSet )
 {
     SwFormatAnchor aAnchor;
 
@@ -2039,20 +2039,20 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
             eSurround = SURROUND_RIGHT;
         }
     }
-    rFrmItemSet.Put( aAnchor );
+    rFrameItemSet.Put( aAnchor );
 
     // Absolut Positioniert mit Durchlauf
-    rFrmItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
-    rFrmItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) );
-    rFrmItemSet.Put( SwFormatSurround( eSurround ) );
+    rFrameItemSet.Put( SwFormatHoriOrient( nHoriPos, eHoriOri, eHoriRel ) );
+    rFrameItemSet.Put( SwFormatVertOrient( nVertPos, eVertOri, eVertRel ) );
+    rFrameItemSet.Put( SwFormatSurround( eSurround ) );
 }
 
 void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
                                SvxCSS1PropertyInfo &rPropInfo,
-                               SfxItemSet &rFrmItemSet,
+                               SfxItemSet &rFrameItemSet,
                                SwTwips nDfltWidth, sal_uInt8 nDfltPrcWidth )
 {
-    SwFrmSize eSize = ATT_MIN_SIZE;
+    SwFrameSize eSize = ATT_MIN_SIZE;
     SwTwips nWidth = nDfltWidth, nHeight = MINFLY;
     sal_uInt8 nPrcWidth = nDfltPrcWidth, nPrcHeight = 0;
     switch( rPropInfo.eWidthType )
@@ -2082,16 +2082,16 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
         ;
     }
 
-    SwFormatFrmSize aFrmSize( eSize, nWidth, nHeight );
-    aFrmSize.SetWidthPercent( nPrcWidth );
-    aFrmSize.SetHeightPercent( nPrcHeight );
-    rFrmItemSet.Put( aFrmSize );
+    SwFormatFrameSize aFrameSize( eSize, nWidth, nHeight );
+    aFrameSize.SetWidthPercent( nPrcWidth );
+    aFrameSize.SetHeightPercent( nPrcHeight );
+    rFrameItemSet.Put( aFrameSize );
 }
 
 void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
                                    SvxCSS1PropertyInfo & /*rPropInfo*/,
                                    sal_uInt16 nFlags,
-                                   SfxItemSet &rFrmItemSet )
+                                   SfxItemSet &rFrameItemSet )
 {
     const SfxPoolItem *pItem;
     if( (nFlags & HTML_FF_BOX) != 0 &&
@@ -2102,11 +2102,11 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
             SvxBoxItem aBoxItem( *static_cast<const SvxBoxItem *>(pItem) );
             // Alle 4 Seiten gleichzeitig auf 0 setzen
             aBoxItem.SetDistance( 0 );
-            rFrmItemSet.Put( aBoxItem );
+            rFrameItemSet.Put( aBoxItem );
         }
         else
         {
-            rFrmItemSet.Put( *pItem );
+            rFrameItemSet.Put( *pItem );
         }
         rItemSet.ClearItem( RES_BOX );
     }
@@ -2114,14 +2114,14 @@ void SwHTMLParser::SetFrameFormatAttrs( SfxItemSet &rItemSet,
     if( (nFlags & HTML_FF_BACKGROUND) != 0 &&
         SfxItemState::SET==rItemSet.GetItemState( RES_BACKGROUND, true, &pItem ) )
     {
-        rFrmItemSet.Put( *pItem );
+        rFrameItemSet.Put( *pItem );
         rItemSet.ClearItem( RES_BACKGROUND );
     }
 
     if( (nFlags & HTML_FF_DIRECTION) != 0 &&
         SfxItemState::SET==rItemSet.GetItemState( RES_FRAMEDIR, true, &pItem ) )
     {
-        rFrmItemSet.Put( *pItem );
+        rFrameItemSet.Put( *pItem );
         rItemSet.ClearItem( RES_FRAMEDIR );
     }
 }
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 669a46862d44..01aa9ea1f838 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -423,27 +423,27 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
     // - es wurde eine Breite angegeben (in beiden Faellen noetig)
     if( SwCSS1Parser::MayBePositioned( rPropInfo ) )
     {
-        SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
+        SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrameFormatAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
         // Ausrichtung setzen
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, rItemSet, rPropInfo,
-                                aFrmItemSet );
+                                aFrameItemSet );
 
         // Groesse setzen
-        SetVarSize( rItemSet, rPropInfo, aFrmItemSet );
+        SetVarSize( rItemSet, rPropInfo, aFrameItemSet );
 
         // Abstaende setzen
-        SetSpace( Size(0,0), rItemSet, rPropInfo, aFrmItemSet );
+        SetSpace( Size(0,0), rItemSet, rPropInfo, aFrameItemSet );
 
         // Sonstige CSS1-Attribute Setzen
         SetFrameFormatAttrs( rItemSet, rPropInfo,
                         HTML_FF_BOX|HTML_FF_PADDING|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
-                        aFrmItemSet );
+                        aFrameItemSet );
 
-        InsertFlyFrame( aFrmItemSet, pContext, rPropInfo.aId,
+        InsertFlyFrame( aFrameItemSet, pContext, rPropInfo.aId,
                         CONTEXT_FLAGS_ABSPOS );
         pContext->SetPopStack( true );
         rPropInfo.aId.clear();
@@ -463,18 +463,18 @@ bool SwHTMLParser::CreateContainer( const OUString& rClass,
         SwCSS1Parser::MayBePositioned( rPropInfo ) )
     {
         // Container-Klasse
-        SfxItemSet *pFrmItemSet = pContext->GetFrmItemSet( m_pDoc );
+        SfxItemSet *pFrameItemSet = pContext->GetFrameItemSet( m_pDoc );
         if( !IsNewDoc() )
-            Reader::ResetFrameFormatAttrs( *pFrmItemSet );
+            Reader::ResetFrameFormatAttrs( *pFrameItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE,
-                                rItemSet, rPropInfo, *pFrmItemSet );
+                                rItemSet, rPropInfo, *pFrameItemSet );
         Size aDummy(0,0);
         SetFixSize( aDummy, aDummy, false, false, rItemSet, rPropInfo,
-                    *pFrmItemSet );
-        SetSpace( aDummy, rItemSet, rPropInfo, *pFrmItemSet );
+                    *pFrameItemSet );
+        SetSpace( aDummy, rItemSet, rPropInfo, *pFrameItemSet );
         SetFrameFormatAttrs( rItemSet, rPropInfo, HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_DIRECTION,
-                        *pFrmItemSet );
+                        *pFrameItemSet );
 
         bRet = true;
     }
@@ -730,12 +730,12 @@ void SwHTMLParser::SplitPREListingXMP( _HTMLAttrContext *pCntxt )
     FinishPREListingXMP();
 }
 
-SfxItemSet *_HTMLAttrContext::GetFrmItemSet( SwDoc *pCreateDoc )
+SfxItemSet *_HTMLAttrContext::GetFrameItemSet( SwDoc *pCreateDoc )
 {
-    if( !pFrmItemSet && pCreateDoc )
-        pFrmItemSet = new SfxItemSet( pCreateDoc->GetAttrPool(),
+    if( !pFrameItemSet && pCreateDoc )
+        pFrameItemSet = new SfxItemSet( pCreateDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
-    return pFrmItemSet;
+    return pFrameItemSet;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index b6fa8fddc5b0..633afe6e83f9 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -83,10 +83,10 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
     // to the visible layer.
     pNewDrawObj->SetLayer( m_pDoc->getIDocumentDrawModelAccess().GetInvisibleHeavenId() );
 
-    SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+    SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrameSet );
 
     sal_uInt16 nLeftSpace = 0, nRightSpace = 0, nUpperSpace = 0, nLowerSpace = 0;
     if( (rPixSpace.Width() || rPixSpace.Height()) && Application::GetDefaultDevice() )
@@ -124,7 +124,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         SvxLRSpaceItem aLRItem( RES_LR_SPACE );
         aLRItem.SetLeft( nLeftSpace );
         aLRItem.SetRight( nRightSpace );
-        aFrmSet.Put( aLRItem );
+        aFrameSet.Put( aLRItem );
     }
 
     // oberen/unteren Rand setzen
@@ -150,7 +150,7 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         SvxULSpaceItem aULItem( RES_UL_SPACE );
         aULItem.SetUpper( nUpperSpace );
         aULItem.SetLower( nLowerSpace );
-        aFrmSet.Put( aULItem );
+        aFrameSet.Put( aULItem );
     }
 
     SwFormatAnchor aAnchor( FLY_AS_CHAR );
@@ -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( SwFormatSurround(SURROUND_THROUGHT) );
+        aFrameSet.Put( SwFormatSurround(SURROUND_THROUGHT) );
     }
     else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
              text::HoriOrientation::LEFT == eHoriOri )
     {
         aAnchor.SetType( FLY_AT_PARA );
-        aFrmSet.Put( SwFormatSurround(bHidden ? SURROUND_THROUGHT
+        aFrameSet.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( SwFormatVertOrient( 0, eVertOri ) );
+        aFrameSet.Put( SwFormatVertOrient( 0, eVertOri ) );
     }
 
     if (FLY_AT_PAGE == aAnchor.GetAnchorId())
@@ -198,9 +198,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
     {
         aAnchor.SetAnchor( m_pPam->GetPoint() );
     }
-    aFrmSet.Put( aAnchor );
+    aFrameSet.Put( aAnchor );
 
-    m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrmSet );
+    m_pDoc->getIDocumentContentOperations().InsertDrawObj( *m_pPam, *pNewDrawObj, aFrameSet );
 }
 
 static void PutEEPoolItem( SfxItemSet &rEEItemSet,
diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx
index f879cf3c7b17..c9769f8a52e0 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -283,12 +283,12 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
         rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
     // und nun noch ALIGN, HSPACE und VSPACE
-    sal_uInt32 nFrmFlags = HTML_FRMOPTS_MARQUEE;
+    sal_uInt32 nFrameFlags = HTML_FRMOPTS_MARQUEE;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
-        nFrmFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
-    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmFlags );
+        nFrameFlags |= HTML_FRMOPTS_MARQUEE_CSS1;
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_DRAW ) )
-        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmFlags, &rSdrObject );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameFlags, &rSdrObject );
 
     rWrt.Strm().WriteChar( '>' );
 
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index d7320398f63d..ddabe12afee2 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -35,7 +35,7 @@
 
 using namespace css;
 
-SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
+SwHTMLPosFlyFrame::SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly,
                                   const SdrObject *pSdrObj,
                                   sal_uInt8 nOutMode ) :
     pFrameFormat( &rPosFly.GetFormat() ),
@@ -69,22 +69,22 @@ SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
     }
 }
 
-bool SwHTMLPosFlyFrm::operator<( const SwHTMLPosFlyFrm& rFrm ) const
+bool SwHTMLPosFlyFrame::operator<( const SwHTMLPosFlyFrame& rFrame ) const
 {
-    if( pNdIdx->GetIndex() == rFrm.pNdIdx->GetIndex() )
+    if( pNdIdx->GetIndex() == rFrame.pNdIdx->GetIndex() )
     {
-        if( nContentIdx == rFrm.nContentIdx )
+        if( nContentIdx == rFrame.nContentIdx )
         {
-            if( GetOutPos() == rFrm.GetOutPos() )
-                return nOrdNum < rFrm.nOrdNum;
+            if( GetOutPos() == rFrame.GetOutPos() )
+                return nOrdNum < rFrame.nOrdNum;
             else
-                return GetOutPos() < rFrm.GetOutPos();
+                return GetOutPos() < rFrame.GetOutPos();
         }
         else
-            return nContentIdx < rFrm.nContentIdx;
+            return nContentIdx < rFrame.nContentIdx;
     }
     else
-        return pNdIdx->GetIndex() < rFrm.pNdIdx->GetIndex();
+        return pNdIdx->GetIndex() < rFrame.pNdIdx->GetIndex();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlfly.hxx b/sw/source/filter/html/htmlfly.hxx
index 265305385b62..bf42b0f5ee46 100644
--- a/sw/source/filter/html/htmlfly.hxx
+++ b/sw/source/filter/html/htmlfly.hxx
@@ -26,11 +26,11 @@
 class SdrObject;
 class SwFrameFormat;
 class SwNodeIndex;
-class SwPosFlyFrm;
+class SwPosFlyFrame;
 
 // ACHTUNG: Die Werte dieses Enumgs gehen direkt in die
 // Augabe Tabelle!!!
-enum SwHTMLFrmType
+enum SwHTMLFrameType
 {
     HTML_FRMTYPE_TABLE,
     HTML_FRMTYPE_TABLE_CAP,
@@ -76,28 +76,28 @@ enum SwHTMLFrmType
 const sal_uInt16 MAX_FRMTYPES = HTML_FRMTYPE_END;
 const sal_uInt16 MAX_BROWSERS = 4;
 
-extern sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS];
-extern sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS];
+extern sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS];
 
-class SwHTMLPosFlyFrm
+class SwHTMLPosFlyFrame
 {
     const SwFrameFormat      *pFrameFormat;       // der Rahmen
     const SdrObject     *pSdrObject;    // ggf. Sdr-Objekt
     SwNodeIndex         *pNdIdx;        // Node-Index
-    sal_uInt32              nOrdNum;        // Aus SwPosFlyFrm
+    sal_uInt32              nOrdNum;        // Aus SwPosFlyFrame
     sal_Int32          nContentIdx;      // seine Position im Content
     sal_uInt8               nOutputMode;    // Ausgabe-Infos
 
 public:
 
-    SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
+    SwHTMLPosFlyFrame( const SwPosFlyFrame& rPosFly,
                      const SdrObject *pSdrObj, sal_uInt8 nOutMode );
 
-    bool operator==( const SwHTMLPosFlyFrm& ) const { return false; }
-    bool operator<( const SwHTMLPosFlyFrm& ) const;
+    bool operator==( const SwHTMLPosFlyFrame& ) const { return false; }
+    bool operator<( const SwHTMLPosFlyFrame& ) const;
 
     const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
     const SdrObject *GetSdrObject() const { return pSdrObject; }
@@ -115,9 +115,9 @@ public:
     sal_uInt8 GetOutPos() const { return nOutputMode & HTML_POS_MASK; }
 };
 
-class SwHTMLPosFlyFrms
-    : public o3tl::sorted_vector<SwHTMLPosFlyFrm*,
-                o3tl::less_ptr_to<SwHTMLPosFlyFrm>,
+class SwHTMLPosFlyFrames
+    : public o3tl::sorted_vector<SwHTMLPosFlyFrame*,
+                o3tl::less_ptr_to<SwHTMLPosFlyFrame>,
                 o3tl::find_partialorder_ptrequals>
 {};
 
diff --git a/sw/source/filter/html/htmlflyt.cxx b/sw/source/filter/html/htmlflyt.cxx
index 21fd0c75dcff..f8b61022b07f 100644
--- a/sw/source/filter/html/htmlflyt.cxx
+++ b/sw/source/filter/html/htmlflyt.cxx
@@ -21,7 +21,7 @@
 
 #define TE(t,p,c) (sal_uInt8)( HTML_OUT_##t | HTML_POS_##p | HTML_CNTNR_##c )
 
-sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
+sal_uInt8 aHTMLOutFramePageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
 {
     {
         // Textrahmen mit Tabelle
@@ -117,7 +117,7 @@ sal_uInt8 aHTMLOutFrmPageFlyTable[MAX_FRMTYPES][MAX_BROWSERS] =
     }
 };
 
-sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
+sal_uInt8 aHTMLOutFrameParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
 {
     {
         // Textrahmen mit Tabelle
@@ -214,7 +214,7 @@ sal_uInt8 aHTMLOutFrmParaFrameTable[MAX_FRMTYPES][MAX_BROWSERS] =
     }
 };
 
-sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
+sal_uInt8 aHTMLOutFrameParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
 {
     {
         // Textrahmen mit Tabelle
@@ -310,7 +310,7 @@ sal_uInt8 aHTMLOutFrmParaPrtAreaTable[MAX_FRMTYPES][MAX_BROWSERS] =
     }
 };
 
-sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
+sal_uInt8 aHTMLOutFrameParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
 {
     {
         // Textrahmen mit Tabelle
@@ -406,7 +406,7 @@ sal_uInt8 aHTMLOutFrmParaOtherTable[MAX_FRMTYPES][MAX_BROWSERS] =
     }
 };
 
-sal_uInt8 aHTMLOutFrmAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
+sal_uInt8 aHTMLOutFrameAsCharTable[MAX_FRMTYPES][MAX_BROWSERS] =
 {
     {
         // Textrahmen mit Tabelle
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 2defd045c41e..9395e49290a3 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -158,10 +158,10 @@ static HTMLOutEvent aIMapEventTable[] =
     { nullptr,                        nullptr,                      0                           }
 };
 
-sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
+sal_uInt16 SwHTMLWriter::GuessFrameType( const SwFrameFormat& rFrameFormat,
                                    const SdrObject*& rpSdrObj )
 {
-    SwHTMLFrmType eType;
+    SwHTMLFrameType eType;
 
     if( RES_DRAWFRMFMT == rFrameFormat.Which() )
     {
@@ -205,7 +205,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
         else if( pNd->IsOLENode() )
         {
             // Applet, Plugin, Floating-Frame
-            eType = (SwHTMLFrmType)GuessOLENodeFrmType( *pNd );
+            eType = (SwHTMLFrameType)GuessOLENodeFrameType( *pNd );
         }
         else
         {
@@ -246,11 +246,11 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
                     // leerer Rahmen? Nur wenn kein Rahmen am
                     // Text- oder Start-Node verankert ist.
                     bEmpty = true;
-                    if( m_pHTMLPosFlyFrms )
+                    if( m_pHTMLPosFlyFrames )
                     {
-                        for( auto pHTMLPosFlyFrm : *m_pHTMLPosFlyFrms )
+                        for( auto pHTMLPosFlyFrame : *m_pHTMLPosFlyFrames )
                         {
-                            sal_uLong nIdx = pHTMLPosFlyFrm->GetNdIndex().GetIndex();
+                            sal_uLong nIdx = pHTMLPosFlyFrame->GetNdIndex().GetIndex();
                             bEmpty = (nIdx != nStt) && (nIdx != nStt-1);
                             if( !bEmpty || nIdx > nStt )
                                 break;
@@ -288,20 +288,20 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrameFormat& rFrameFormat,
     return static_cast< sal_uInt16 >(eType);
 }
 
-void SwHTMLWriter::CollectFlyFrms()
+void SwHTMLWriter::CollectFlyFrames()
 {
     OSL_ENSURE( HTML_CFG_MAX+1 == MAX_BROWSERS,
             "number of browser configurations has changed" );
 
-    SwPosFlyFrms aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? nullptr : pCurPam, true));
+    SwPosFlyFrames aFlyPos(pDoc->GetAllFlyFormats(bWriteAll ? nullptr : pCurPam, true));
 
-    for(SwPosFlyFrms::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter)
+    for(SwPosFlyFrames::const_iterator aIter(aFlyPos.begin()); aIter != aFlyPos.end(); ++aIter)
     {
         const SwFrameFormat& rFrameFormat = (*aIter)->GetFormat();
         const SdrObject *pSdrObj = nullptr;
         const SwPosition *pAPos;
         const SwContentNode *pACNd;
-        SwHTMLFrmType eType = (SwHTMLFrmType)GuessFrmType( rFrameFormat, pSdrObj );
+        SwHTMLFrameType eType = (SwHTMLFrameType)GuessFrameType( rFrameFormat, pSdrObj );
 
         sal_uInt8 nMode;
         const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
@@ -310,7 +310,7 @@ void SwHTMLWriter::CollectFlyFrms()
         {
         case FLY_AT_PAGE:
         case FLY_AT_FLY:
-            nMode = aHTMLOutFrmPageFlyTable[eType][m_nExportMode];
+            nMode = aHTMLOutFramePageFlyTable[eType][m_nExportMode];
             break;
 
         case FLY_AT_PARA:
@@ -325,56 +325,56 @@ void SwHTMLWriter::CollectFlyFrms()
                     static_cast<const SvxLRSpaceItem&>(pACNd->GetAttr(RES_LR_SPACE));
                 if( rLRItem.GetTextLeft() || rLRItem.GetRight() )
                 {
-                    nMode = aHTMLOutFrmParaFrameTable[eType][m_nExportMode];
+                    nMode = aHTMLOutFrameParaFrameTable[eType][m_nExportMode];
                     break;
                 }
             }
-            nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
+            nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode];
             break;
 
         case FLY_AT_CHAR:
             if( text::RelOrientation::FRAME == eHoriRel || text::RelOrientation::PRINT_AREA == eHoriRel )
-                nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
+                nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode];
             else
-                nMode = aHTMLOutFrmParaOtherTable[eType][m_nExportMode];
+                nMode = aHTMLOutFrameParaOtherTable[eType][m_nExportMode];
             break;
 
         default:
-            nMode = aHTMLOutFrmParaPrtAreaTable[eType][m_nExportMode];
+            nMode = aHTMLOutFrameParaPrtAreaTable[eType][m_nExportMode];
             break;
         }
 
-        if( !m_pHTMLPosFlyFrms )
-            m_pHTMLPosFlyFrms = new SwHTMLPosFlyFrms;
+        if( !m_pHTMLPosFlyFrames )
+            m_pHTMLPosFlyFrames = new SwHTMLPosFlyFrames;
 
-        SwHTMLPosFlyFrm *pNew = new SwHTMLPosFlyFrm(**aIter, pSdrObj, nMode);
-        m_pHTMLPosFlyFrms->insert( pNew );
+        SwHTMLPosFlyFrame *pNew = new SwHTMLPosFlyFrame(**aIter, pSdrObj, nMode);
+        m_pHTMLPosFlyFrames->insert( pNew );
     }
 }
 
-bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos,
+bool SwHTMLWriter::OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8 nPos,
                               HTMLOutContext *pContext )
 {
     bool bFlysLeft = false; // Noch Flys an aktueller Node-Position da?
 
-    // OutFlyFrm kan rekursiv aufgerufen werden. Deshalb muss man
+    // OutFlyFrame kan rekursiv aufgerufen werden. Deshalb muss man
     // manchmal wieder von vorne anfangen, nachdem ein Fly ausgegeben
     // wurde.
     bool bRestart = true;
-    while( m_pHTMLPosFlyFrms && bRestart )
+    while( m_pHTMLPosFlyFrames && bRestart )
     {
         bFlysLeft = bRestart = false;
 
         // suche nach dem Anfang der FlyFrames
         size_t i {0};
 
-        for( ; i < m_pHTMLPosFlyFrms->size() &&
-            (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ )
+        for( ; i < m_pHTMLPosFlyFrames->size() &&
+            (*m_pHTMLPosFlyFrames)[i]->GetNdIndex().GetIndex() < nNdIdx; i++ )
             ;
-        for( ; !bRestart && i < m_pHTMLPosFlyFrms->size() &&
-            (*m_pHTMLPosFlyFrms)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ )
+        for( ; !bRestart && i < m_pHTMLPosFlyFrames->size() &&
+            (*m_pHTMLPosFlyFrames)[i]->GetNdIndex().GetIndex() == nNdIdx; i++ )
         {
-            SwHTMLPosFlyFrm *pPosFly = (*m_pHTMLPosFlyFrms)[i];
+            SwHTMLPosFlyFrame *pPosFly = (*m_pHTMLPosFlyFrames)[i];
             if( ( HTML_POS_ANY == nPos ||
                   pPosFly->GetOutPos() == nPos ) &&
                 pPosFly->GetContentIndex() == nContentIdx )
@@ -382,12 +382,12 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8
                 // Erst entfernen ist wichtig, weil in tieferen
                 // Rekursionen evtl. weitere Eintraege oder das
                 // ganze Array geloscht werden koennte.
-                m_pHTMLPosFlyFrms->erase(i);
+                m_pHTMLPosFlyFrames->erase(i);
                 i--;
-                if( m_pHTMLPosFlyFrms->empty() )
+                if( m_pHTMLPosFlyFrames->empty() )
                 {
-                    delete m_pHTMLPosFlyFrms;
-                    m_pHTMLPosFlyFrms = nullptr;
+                    delete m_pHTMLPosFlyFrames;
+                    m_pHTMLPosFlyFrames = nullptr;
                     bRestart = true;    // nicht wirklich, nur raus
                                         // aus der Schleife
                 }
@@ -424,8 +424,8 @@ bool SwHTMLWriter::OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx, sal_uInt8
 void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameFormat,
                               const SdrObject *pSdrObject )
 {
-    sal_uInt8 nCntnrMode = SwHTMLPosFlyFrm::GetOutCntnr( nMode );
-    sal_uInt8 nOutMode = SwHTMLPosFlyFrm::GetOutFn(nMode);
+    sal_uInt8 nCntnrMode = SwHTMLPosFlyFrame::GetOutCntnr( nMode );
+    sal_uInt8 nOutMode = SwHTMLPosFlyFrame::GetOutFn(nMode);
     const sal_Char *pCntnrStr = nullptr;
     if( HTML_CNTNR_NONE != nCntnrMode )
     {
@@ -443,15 +443,15 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
         // Fuer Nicht-Zeichenobekte eine Breite ausgeben
-        sal_uLong nFrmFlags = HTML_FRMOPTS_CNTNR;
+        sal_uLong nFrameFlags = HTML_FRMOPTS_CNTNR;
 
         // Fuer spaltige Rahmen koennen wir auch noch den Hintergrund ausgeben.
         if( HTML_OUT_MULTICOL == nOutMode )
-            nFrmFlags |= HTML_FRMOPT_S_BACKGROUND|HTML_FRMOPT_S_BORDER;
+            nFrameFlags |= HTML_FRMOPT_S_BACKGROUND|HTML_FRMOPT_S_BORDER;
 
         if( IsHTMLMode( HTMLMODE_BORDER_NONE ) )
-           nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
-        OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags, pSdrObject );
+           nFrameFlags |= HTML_FRMOPT_S_NOBORDER;
+        OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags, pSdrObject );
         Strm().WriteChar( '>' );
 
         if( HTML_CNTNR_DIV == nCntnrMode )
@@ -520,7 +520,7 @@ void SwHTMLWriter::OutFrameFormat( sal_uInt8 nMode, const SwFrameFormat& rFrameF
 
 OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
                                      const OUString& rAlternateText,
-                                     sal_uInt32 nFrmOpts,
+                                     sal_uInt32 nFrameOpts,
                                      const OString &rEndTags )
 {
     OString sRetEndTags(rEndTags);
@@ -529,11 +529,11 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     const SfxItemSet& rItemSet = rFrameFormat.GetAttrSet();
 
     // Name
-    if( (nFrmOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
+    if( (nFrameOpts & (HTML_FRMOPT_ID|HTML_FRMOPT_NAME)) &&
         !rFrameFormat.GetName().isEmpty() )
     {
         const sal_Char *pStr =
-            (nFrmOpts & HTML_FRMOPT_ID) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name;
+            (nFrameOpts & 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() );
@@ -542,7 +542,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     }
 
     // Name
-    if( nFrmOpts & HTML_FRMOPT_DIR )
+    if( nFrameOpts & HTML_FRMOPT_DIR )
     {
         sal_uInt16 nDir = GetHTMLDirection( rItemSet );
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
@@ -550,7 +550,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     }
 
     // ALT
-    if( (nFrmOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() )
+    if( (nFrameOpts & HTML_FRMOPT_ALT) && !rAlternateText.isEmpty() )
     {
         sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_alt).
             append("=\"");
@@ -562,14 +562,14 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
     // ALIGN
     const sal_Char *pStr = nullptr;
     RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
-    if( (nFrmOpts & HTML_FRMOPT_ALIGN) &&
+    if( (nFrameOpts & 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 SwFormatHoriOrient& rHoriOri = rFrameFormat.GetHoriOrient();
-        if( !(nFrmOpts & HTML_FRMOPT_S_ALIGN) ||
+        if( !(nFrameOpts & HTML_FRMOPT_S_ALIGN) ||
             text::RelOrientation::FRAME == rHoriOri.GetRelationOrient() ||
             text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
         {
@@ -578,8 +578,8 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
                         : OOO_STRING_SVTOOLS_HTML_AL_left;
         }
     }
-    if( (nFrmOpts & HTML_FRMOPT_ALIGN) && !pStr &&
-        ( (nFrmOpts & HTML_FRMOPT_S_ALIGN) == 0 ||
+    if( (nFrameOpts & HTML_FRMOPT_ALIGN) && !pStr &&
+        ( (nFrameOpts & HTML_FRMOPT_S_ALIGN) == 0 ||
           (FLY_AS_CHAR == eAnchorId) ) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem ))
     {
@@ -605,7 +605,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
 
     // HSPACE und VSPACE
     Size aTwipSpc( 0, 0 );
-    if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
+    if( (nFrameOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem ))
     {
         aTwipSpc.Width() =
@@ -613,7 +613,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
                 static_cast<const SvxLRSpaceItem*>(pItem)->GetRight() ) / 2;
         m_nDfltLeftMargin = m_nDfltRightMargin = aTwipSpc.Width();
     }
-    if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
+    if( (nFrameOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem ))
     {
         aTwipSpc.Height()  =
@@ -622,7 +622,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
         m_nDfltTopMargin = m_nDfltBottomMargin = (sal_uInt16)aTwipSpc.Height();
     }
 
-    if( (nFrmOpts & HTML_FRMOPT_SPACE) &&
+    if( (nFrameOpts & HTML_FRMOPT_SPACE) &&
         (aTwipSpc.Width() || aTwipSpc.Height()) &&
         Application::GetDefaultDevice() )
     {
@@ -649,7 +649,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
 
     // Der Abstand muss bei der Groesse beruecksichtigt, wenn das entsprechende
     // Flag gesetzt ist.
-    if( (nFrmOpts & HTML_FRMOPT_MARGINSIZE) )
+    if( (nFrameOpts & HTML_FRMOPT_MARGINSIZE) )
     {
         aTwipSpc.Width() *= -2;
         aTwipSpc.Height() *= -2;
@@ -660,7 +660,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
         aTwipSpc.Height() = 0;
     }
 
-    if( !(nFrmOpts & HTML_FRMOPT_ABSSIZE) &&
+    if( !(nFrameOpts & HTML_FRMOPT_ABSSIZE) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_BOX, true, &pItem ))
     {
         const SvxBoxItem* pBoxItem = static_cast<const SvxBoxItem*>(pItem);
@@ -673,12 +673,12 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
 
     // WIDTH und/oder HEIGHT
     // ATT_VAR_SIZE/ATT_MIN_SIZE nur ausgeben, wenn ANYSIZE gesezut ist
-    if( (nFrmOpts & HTML_FRMOPT_SIZE) &&
+    if( (nFrameOpts & HTML_FRMOPT_SIZE) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
-        ( (nFrmOpts & HTML_FRMOPT_ANYSIZE) ||
-          ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
+        ( (nFrameOpts & HTML_FRMOPT_ANYSIZE) ||
+          ATT_FIX_SIZE == static_cast<const SwFormatFrameSize *>(pItem)->GetHeightSizeType()) )
     {
-        const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
+        const SwFormatFrameSize *pFSItem = static_cast<const SwFormatFrameSize *>(pItem);
         sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
         sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
 
@@ -708,7 +708,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
                 aPixelSz.Height() = 1;
         }
 
-        if( (nFrmOpts & HTML_FRMOPT_WIDTH) &&
+        if( (nFrameOpts & HTML_FRMOPT_WIDTH) &&
             ((nPrcWidth && nPrcWidth!=255) || aPixelSz.Width()) )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).
@@ -720,7 +720,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
             sOut.append("\"");
         }
 
-        if( (nFrmOpts & HTML_FRMOPT_HEIGHT) &&
+        if( (nFrameOpts & HTML_FRMOPT_HEIGHT) &&
             ((nPrcHeight && nPrcHeight!=255) || aPixelSz.Height()) )
         {
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).
@@ -738,7 +738,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat,
 
     // Umlauf fuer absatzgeb. Grafiken als <BR CLEAR=...> in den String
     // schreiben
-    if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) &&
+    if( (nFrameOpts & HTML_FRMOPT_BRCLEAR) &&
         ((FLY_AT_PARA == rFrameFormat.GetAnchor().GetAnchorId()) ||
          (FLY_AT_CHAR == rFrameFormat.GetAnchor().GetAnchorId())) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem ))
@@ -942,9 +942,9 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameForma
     if( (nFrameOptions & HTML_FRMOPT_SIZE) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) &&
         ( (nFrameOptions & HTML_FRMOPT_ANYSIZE) ||
-          ATT_FIX_SIZE == static_cast<const SwFormatFrmSize *>(pItem)->GetHeightSizeType()) )
+          ATT_FIX_SIZE == static_cast<const SwFormatFrameSize *>(pItem)->GetHeightSizeType()) )
     {
-        const SwFormatFrmSize *pFSItem = static_cast<const SwFormatFrmSize *>(pItem);
+        const SwFormatFrameSize *pFSItem = static_cast<const SwFormatFrameSize *>(pItem);
         sal_uInt8 nPrcWidth = pFSItem->GetWidthPercent();
         sal_uInt8 nPrcHeight = pFSItem->GetHeightPercent();
 
@@ -1125,12 +1125,12 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
         Fraction aScaleX(1, 1);
         Fraction aScaleY(1, 1);
 
-        const SwFormatFrmSize& rFrmSize = rFrameFormat.GetFrmSize();
+        const SwFormatFrameSize& rFrameSize = rFrameFormat.GetFrameSize();
         const SvxBoxItem& rBox = rFrameFormat.GetBox();
 
-        if (!rFrmSize.GetWidthPercent() && rRealSize.Width())
+        if (!rFrameSize.GetWidthPercent() && rRealSize.Width())
         {
-            SwTwips nWidth = rFrmSize.GetWidth();
+            SwTwips nWidth = rFrameSize.GetWidth();
             nWidth -= rBox.CalcLineSpace(SvxBoxItemLine::LEFT) + rBox.CalcLineSpace(SvxBoxItemLine::RIGHT);
 
             OSL_ENSURE( nWidth > 0, "Gibt es 0 twip breite Grafiken!?" );
@@ -1144,9 +1144,9 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
             }
         }
 
-        if (!rFrmSize.GetHeightPercent() && rRealSize.Height())
+        if (!rFrameSize.GetHeightPercent() && rRealSize.Height())
         {
-            SwTwips nHeight = rFrmSize.GetHeight();
+            SwTwips nHeight = rFrameSize.GetHeight();
 
             nHeight -= rBox.CalcLineSpace(SvxBoxItemLine::TOP) + rBox.CalcLineSpace(SvxBoxItemLine::BOTTOM);
 
@@ -1203,7 +1203,7 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con
 
 Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
                        Graphic& rGraphic, const OUString& rAlternateText,
-                       const Size &rRealSize, sal_uInt32 nFrmOpts,
+                       const Size &rRealSize, sal_uInt32 nFrameOpts,
                        const sal_Char *pMarkType,
                        const ImageMap *pAltImgMap )
 {
@@ -1292,7 +1292,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
 
     // <font color = ...>...<img ... >...</font>
     sal_uInt16 nBorderWidth = 0;
-    if( (nFrmOpts & HTML_FRMOPT_BORDER) &&
+    if( (nFrameOpts & HTML_FRMOPT_BORDER) &&
         SfxItemState::SET == rItemSet.GetItemState( RES_BOX, true, &pItem ))
     {
         Size aTwipBorder( 0, 0 );
@@ -1380,11 +1380,11 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrameFormat &rFrameFormat,
     }
 
     // alt, align, width, height, hspace, vspace
-    rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrmOpts);
+    rHTMLWrt.writeFrameFormatOptions(aHtml, rFrameFormat, rAlternateText, nFrameOpts);
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) )
-        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameOpts );
 
-    if( nFrmOpts & HTML_FRMOPT_BORDER )
+    if( nFrameOpts & HTML_FRMOPT_BORDER )
     {
         aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_border, nBorderWidth);
     }
@@ -1543,13 +1543,13 @@ static Writer & OutHTML_FrameFormatAsMulticol( Writer& rWrt,
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
 
     // WIDTH
-    sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR
+    sal_uLong nFrameFlags = bInCntnr ? HTML_FRMOPTS_MULTICOL_CNTNR
                                 : HTML_FRMOPTS_MULTICOL;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
-        nFrmFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
-    rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
+        nFrameFlags |= HTML_FRMOPTS_MULTICOL_CSS1;
+    rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
-        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags );
 
     rWrt.Strm().WriteChar( '>' );
 
@@ -1629,11 +1629,11 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
     sOut.append('<').append(pStr);
 
     rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
-    sal_uLong nFrmFlags = HTML_FRMOPTS_DIV;
+    sal_uLong nFrameFlags = HTML_FRMOPTS_DIV;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_BORDER_NONE ) )
-       nFrmFlags |= HTML_FRMOPT_S_NOBORDER;
-    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrmFlags );
-    rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmFlags );
+       nFrameFlags |= HTML_FRMOPT_S_NOBORDER;
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, aEmptyOUStr, nFrameFlags );
+    rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameFlags );
     rWrt.Strm().WriteChar( '>' );
 
     rHTMLWrt.IncIndentLevel();  // den Inhalt einruecken
@@ -1643,7 +1643,7 @@ static Writer& OutHTML_FrameFormatAsDivOrSpan( Writer& rWrt,
     sal_uLong nStt = rFlyContent.GetContentIdx()->GetIndex();
 
     // Am Start-Node verankerte Rahmen-gebundene Rahmen ausgeben
-    rHTMLWrt.OutFlyFrm( nStt, 0, HTML_POS_ANY );
+    rHTMLWrt.OutFlyFrame( nStt, 0, HTML_POS_ANY );
 
     const SwStartNode* pSttNd = rWrt.pDoc->GetNodes()[nStt]->GetStartNode();
     OSL_ENSURE( pSttNd, "Wo ist der Start-Node" );
@@ -1702,13 +1702,13 @@ static Writer& OutHTML_FrameFormatGrfNode( Writer& rWrt, const SwFrameFormat& rF
     if( !pGrfNd )
         return rWrt;
 
-    sal_uLong nFrmFlags = bInCntnr ? HTML_FRMOPTS_IMG_CNTNR : HTML_FRMOPTS_IMG;
+    sal_uLong nFrameFlags = bInCntnr ? HTML_FRMOPTS_IMG_CNTNR : HTML_FRMOPTS_IMG;
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bInCntnr )
-         nFrmFlags |= HTML_FRMOPTS_IMG_CSS1;
+         nFrameFlags |= HTML_FRMOPTS_IMG_CSS1;
 
     Graphic aGraphic = pGrfNd->GetGraphic();
     OutHTML_Image( rWrt, rFrameFormat, aGraphic, pGrfNd->GetTitle(),
-                  pGrfNd->GetTwipSize(), nFrmFlags, "graphic" );
+                  pGrfNd->GetTwipSize(), nFrameFlags, "graphic" );
 
     return rWrt;
 }
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 4388f16d093f..b56cc4b7db5b 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -725,7 +725,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
     bool bEmptyValue = false;
     uno::Any aTmp = xPropSet->getPropertyValue( "ClassId" );
     sal_Int16 nClassId = *static_cast<sal_Int16 const *>(aTmp.getValue());
-    sal_uInt32 nFrmOpts = HTML_FRMOPTS_CONTROL;
+    sal_uInt32 nFrameOpts = HTML_FRMOPTS_CONTROL;
     switch( nClassId )
     {
     case form::FormComponentType::CHECKBOX:
@@ -914,7 +914,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
 
     case form::FormComponentType::IMAGEBUTTON:
         eType = TYPE_IMAGE;
-        nFrmOpts = HTML_FRMOPTS_IMG_CONTROL;
+        nFrameOpts = HTML_FRMOPTS_IMG_CONTROL;
         break;
 
     default:                // kennt HTML nicht
@@ -1024,13 +1024,13 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
     {
         // Wenn Zeichen-Objekte nicht absolut positioniert werden duerfen,
         // das entsprechende Flag loeschen.
-        nFrmOpts |= (TYPE_IMAGE == eType
+        nFrameOpts |= (TYPE_IMAGE == eType
                             ? HTML_FRMOPTS_IMG_CONTROL_CSS1
                             : HTML_FRMOPTS_CONTROL_CSS1);
     }
     OString aEndTags;
-    if( nFrmOpts != 0 )
-        aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrmOpts );
+    if( nFrameOpts != 0 )
+        aEndTags = rHTMLWrt.OutFrameFormatOptions( rFormat, aEmptyOUStr, nFrameOpts );
 
     if( rHTMLWrt.m_bCfgOutStyles )
     {
@@ -1138,7 +1138,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
             }
         }
 
-        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrmOpts, &rFormObj,
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFormat, nFrameOpts, &rFormObj,
                                         &aItemSet );
     }
 
@@ -1313,22 +1313,22 @@ void SwHTMLWriter::GetControls()
     // Ueber dieses Array laesst sich dann feststellen, wo form::Forms geoeffnet
     // und geschlossen werden muessen.
 
-    if( m_pHTMLPosFlyFrms )
+    if( m_pHTMLPosFlyFrames )
     {
         // die absatz-gebundenen Controls einsammeln
-        for( size_t i=0; i<m_pHTMLPosFlyFrms->size(); i++ )
+        for( size_t i=0; i<m_pHTMLPosFlyFrames->size(); i++ )
         {
-            const SwHTMLPosFlyFrm* pPosFlyFrm = (*m_pHTMLPosFlyFrms)[ i ];
-            if( HTML_OUT_CONTROL != pPosFlyFrm->GetOutFn() )
+            const SwHTMLPosFlyFrame* pPosFlyFrame = (*m_pHTMLPosFlyFrames)[ i ];
+            if( HTML_OUT_CONTROL != pPosFlyFrame->GetOutFn() )
                 continue;
 
-            const SdrObject *pSdrObj = pPosFlyFrm->GetSdrObject();
+            const SdrObject *pSdrObj = pPosFlyFrame->GetSdrObject();
             OSL_ENSURE( pSdrObj, "Wo ist das SdrObject?" );
             if( !pSdrObj )
                 continue;
 
             AddControl( m_aHTMLControls, dynamic_cast<const SdrUnoObj&>(*pSdrObj),
-                        pPosFlyFrm->GetNdIndex().GetIndex() );
+                        pPosFlyFrame->GetNdIndex().GetIndex() );
         }
     }
 
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 35dbcf540ddf..00ec79fd3f97 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -152,36 +152,36 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            sal_Int16 eHoriOri,
                                            const SfxItemSet &rCSS1ItemSet,
                                            const SvxCSS1PropertyInfo &rCSS1PropInfo,
-                                           SfxItemSet& rFrmItemSet )
+                                           SfxItemSet& rFrameItemSet )
 {
     const SfxItemSet *pCntnrItemSet = nullptr;
     auto i = m_aContexts.size();
     while( !pCntnrItemSet && i > m_nContextStMin )
-        pCntnrItemSet = m_aContexts[--i]->GetFrmItemSet();
+        pCntnrItemSet = m_aContexts[--i]->GetFrameItemSet();
 
     if( pCntnrItemSet )
     {
         // Wenn wir und in einem Container befinden wird die Verankerung
         // des Containers uebernommen.
-        rFrmItemSet.Put( *pCntnrItemSet );
+        rFrameItemSet.Put( *pCntnrItemSet );
     }
     else if( SwCSS1Parser::MayBePositioned( rCSS1PropInfo, true ) )
     {
         // Wenn die Ausrichtung anhand der CSS1-Optionen gesetzt werden kann
         // werden die benutzt.
-        SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrmItemSet );
+        SetAnchorAndAdjustment( rCSS1ItemSet, rCSS1PropInfo, rFrameItemSet );
     }
     else
     {
         // Sonst wird die Ausrichtung entsprechend der normalen HTML-Optionen
         // gesetzt.
-        SetAnchorAndAdjustment( eVertOri, eHoriOri, rFrmItemSet );
+        SetAnchorAndAdjustment( eVertOri, eHoriOri, rFrameItemSet );
     }
 }
 
 void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                            sal_Int16 eHoriOri,
-                                           SfxItemSet& rFrmSet,
+                                           SfxItemSet& rFrameSet,
                                            bool bDontAppend )
 {
     bool bMoveBackward = false;
@@ -256,11 +256,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
             eVertRel = text::RelOrientation::PRINT_AREA;
         }
 
-        rFrmSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) );
+        rFrameSet.Put( SwFormatHoriOrient( 0, eHoriOri, eHoriRel) );
 
-        rFrmSet.Put( SwFormatSurround( eSurround ) );
+        rFrameSet.Put( SwFormatSurround( eSurround ) );
     }
-    rFrmSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) );
+    rFrameSet.Put( SwFormatVertOrient( 0, eVertOri, eVertRel) );
 
     if( bMoveBackward )
         m_pPam->Move( fnMoveBackward );
@@ -270,10 +270,10 @@ void SwHTMLParser::SetAnchorAndAdjustment( sal_Int16 eVertOri,
     if( bMoveBackward )
         m_pPam->Move( fnMoveForward );
 
-    rFrmSet.Put( aAnchor );
+    rFrameSet.Put( aAnchor );
 }
 
-void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
+void SwHTMLParser::RegisterFlyFrame( SwFrameFormat *pFlyFormat )
 {
     // automatisch verankerte Rahmen muessen noch um eine Position
     // nach vorne verschoben werden.
@@ -281,7 +281,7 @@ void SwHTMLParser::RegisterFlyFrm( SwFrameFormat *pFlyFormat )
         (FLY_AT_PARA == pFlyFormat->GetAnchor().GetAnchorId()) &&
         SURROUND_THROUGHT == pFlyFormat->GetSurround().GetSurround() )
     {
-        m_aMoveFlyFrms.push_back( pFlyFormat );
+        m_aMoveFlyFrames.push_back( pFlyFormat );
         m_aMoveFlyCnts.push_back( m_pPam->GetPoint()->nContent.GetIndex() );
     }
 }
@@ -494,10 +494,10 @@ IMAGE_SETEVENT:
     if( HasStyleOptions( aStyle, aId, aClass ) )
         ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
-    SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+    SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrameSet );
 
     // Umrandung setzen
     long nHBorderWidth = 0, nVBorderWidth = 0;
@@ -537,17 +537,17 @@ IMAGE_SETEVENT:
         aBoxItem.SetLine( &aHBorderLine, SvxBoxItemLine::BOTTOM );
         aBoxItem.SetLine( &aVBorderLine, SvxBoxItemLine::LEFT );
         aBoxItem.SetLine( &aVBorderLine, SvxBoxItemLine::RIGHT );
-        aFrmSet.Put( aBoxItem );
+        aFrameSet.Put( aBoxItem );
     }
 
     // Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
 
     // Abstaende setzen
-    SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrmSet );
+    SetSpace( Size( nHSpace, nVSpace), aItemSet, aPropInfo, aFrameSet );
 
     // Sonstige CSS1-Attribute Setzen
-    SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrmSet );
+    SetFrameFormatAttrs( aItemSet, aPropInfo, HTML_FF_BOX, aFrameSet );
 
     Size aTwipSz( bPrcWidth ? 0 : nWidth, bPrcHeight ? 0 : nHeight );
     if( (aTwipSz.Width() || aTwipSz.Height()) && Application::GetDefaultDevice() )
@@ -590,7 +590,7 @@ IMAGE_SETEVENT:
 
     Size aGrfSz( 0, 0 );
     bool bSetTwipSize = true;       // Twip-Size am Node setzen?
-    bool bChangeFrmSize = false;    // Frame-Format nachtraeglich anpassen?
+    bool bChangeFrameSize = false;    // Frame-Format nachtraeglich anpassen?
     bool bRequestGrfNow = false;
     bool bSetScaleImageMap = false;
     sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
@@ -608,7 +608,7 @@ IMAGE_SETEVENT:
         }
 
         // Die Groesse des Rahmens wird nachtraeglich gesetzt
-        bChangeFrmSize = true;
+        bChangeFrameSize = true;
         aGrfSz = aTwipSz;
         if( !nWidth && !nHeight )
         {
@@ -673,13 +673,13 @@ IMAGE_SETEVENT:
             SwFormatURL aURL; aURL.SetMap( pImgMap );//wird kopieiert
 
             bSetScaleImageMap = !nPrcWidth || !nPrcHeight;
-            aFrmSet.Put( aURL );
+            aFrameSet.Put( aURL );
         }
         else
         {
             ImageMap aEmptyImgMap( aName );
             SwFormatURL aURL; aURL.SetMap( &aEmptyImgMap );//wird kopieiert
-            aFrmSet.Put( aURL );
+            aFrameSet.Put( aURL );
             m_nMissingImgMaps++;          // es fehlen noch Image-Maps
 
             // die Grafik muss beim SetTwipSize skaliert werden, wenn
@@ -717,14 +717,14 @@ IMAGE_SETEVENT:
             aTwipSz.Height() = MINFLY;
     }
 
-    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
-    aFrmSize.SetWidthPercent( nPrcWidth );
-    aFrmSize.SetHeightPercent( nPrcHeight );
-    aFrmSet.Put( aFrmSize );
+    SwFormatFrameSize aFrameSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+    aFrameSize.SetWidthPercent( nPrcWidth );
+    aFrameSize.SetHeightPercent( nPrcHeight );
+    aFrameSet.Put( aFrameSize );
 
     // passing empty sGrfNm here, means we don't want the graphic to be linked
     SwFrameFormat *pFlyFormat = m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, sGrfNm, aEmptyOUStr, &aGraphic,
-                                      &aFrmSet, nullptr, nullptr );
+                                      &aFrameSet, nullptr, nullptr );
     SwGrfNode *pGrfNd = m_pDoc->GetNodes()[ pFlyFormat->GetContent().GetContentIdx()
                                   ->GetIndex()+1 ]->GetGrfNode();
 
@@ -748,7 +748,7 @@ IMAGE_SETEVENT:
         if( bSetTwipSize )
             pGrfNd->SetTwipSize( aGrfSz );
 
-        pGrfNd->SetChgTwipSize( bChangeFrmSize );
+        pGrfNd->SetChgTwipSize( bChangeFrameSize );
 
         if( bSetScaleImageMap )
             pGrfNd->SetScaleImageMap( true );
@@ -817,7 +817,7 @@ IMAGE_SETEVENT:
     }
 
     // Ggf. Frames anlegen und Auto-gebundenen Rahmen registrieren
-    RegisterFlyFrm( pFlyFormat );
+    RegisterFlyFrame( pFlyFormat );
 
     if( !aId.isEmpty() )
         InsertBookmark( aId );
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index e0caa1610ae3..1ecfa949a72a 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -196,10 +196,10 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize,
     }
 
     // Size setzen
-    SwFormatFrmSize aFrmSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
-    aFrmSize.SetWidthPercent( nPrcWidth );
-    aFrmSize.SetHeightPercent( nPrcHeight );
-    rFlyItemSet.Put( aFrmSize );
+    SwFormatFrameSize aFrameSize( ATT_FIX_SIZE, aTwipSz.Width(), aTwipSz.Height() );
+    aFrameSize.SetWidthPercent( nPrcWidth );
+    aFrameSize.SetHeightPercent( nPrcHeight );
+    rFlyItemSet.Put( aFrameSize );
 }
 
 void SwHTMLParser::SetSpace( const Size& rPixSpace,
@@ -386,7 +386,7 @@ void SwHTMLParser::InsertEmbed()
         ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
     // Die Default-Werte umsetzen (ausser Hoehe/Breite, das macht schon
-    // SetFrmSize() fuer uns)
+    // SetFrameSize() fuer uns)
     if( eVertOri==text::VertOrientation::NONE && eHoriOri==text::HoriOrientation::NONE )
         eVertOri = text::VertOrientation::TOP;
     if( USHRT_MAX==aSpace.Width() )
@@ -395,7 +395,7 @@ void SwHTMLParser::InsertEmbed()
         aSpace.Height() = 0;
     if( bHidden )
     {
-        // Size (0,0) wird in SetFrmSize auf (MINFLY, MINFLY) umgebogen
+        // Size (0,0) wird in SetFrameSize auf (MINFLY, MINFLY) umgebogen
         aSize.Width() = 0; aSize.Height() = 0;
         aSpace.Width() = 0; aSpace.Height() = 0;
         bPrcWidth = bPrcHeight = false;
@@ -437,35 +437,35 @@ void SwHTMLParser::InsertEmbed()
         }
     }
 
-    SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+    SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrameSet );
 
     // den Anker setzen
     if( !bHidden )
     {
-        SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet );
+        SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
     }
     else
     {
         SwFormatAnchor aAnchor( FLY_AT_PARA );
         aAnchor.SetAnchor( m_pPam->GetPoint() );
-        aFrmSet.Put( aAnchor );
-        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 ) );
+        aFrameSet.Put( aAnchor );
+        aFrameSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME) );
+        aFrameSet.Put( SwFormatSurround( SURROUND_THROUGHT ) );
+        aFrameSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
     }
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_EMBED_WIDTH, HTML_DFLT_EMBED_HEIGHT );
     SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                aFrmSet );
-    SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
+                aFrameSet );
+    SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet );
 
     // und in das Dok einfuegen
     SwFrameFormat* pFlyFormat =
-        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, nullptr, nullptr );
+        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr );
 
     // Namen am FrameFormat setzen
     if( !aName.isEmpty() )
@@ -480,10 +480,10 @@ void SwHTMLParser::InsertEmbed()
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
     if( !bHidden )
     {
-        // HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrm
+        // HIDDEN-Plugins sollen absatzgebunden bleiben. Da RegisterFlyFrame
         // absatzgebundene Rahmen mit DUrchlauf in am Zeichen gebundene
         // Rahmen umwandelt, muessen die Frames hier von Hand angelegt werden.
-        RegisterFlyFrm( pFlyFormat );
+        RegisterFlyFrame( pFlyFormat );
     }
 }
 
@@ -611,18 +611,18 @@ void SwHTMLParser::NewObject()
     if( HasStyleOptions( aStyle, aId, aClass ) )
         ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
-    SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet();
+    SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet();
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( rFrmSet );
+        Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
     SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                rFrmSet );
-    SetSpace( aSpace, aItemSet, aPropInfo, rFrmSet );
+                rFrameSet );
+    SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet );
 }
 #endif
 
@@ -650,7 +650,7 @@ void SwHTMLParser::EndObject()
         pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() );
 
         // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-        RegisterFlyFrm( pFlyFormat );
+        RegisterFlyFrame( pFlyFormat );
 
         delete m_pAppletImpl;
         m_pAppletImpl = nullptr;
@@ -746,18 +746,18 @@ void SwHTMLParser::InsertApplet()
     if( HasStyleOptions( aStyle, aId, aClass ) )
         ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
-    SfxItemSet& rFrmSet = m_pAppletImpl->GetItemSet();
+    SfxItemSet& rFrameSet = m_pAppletImpl->GetItemSet();
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( rFrmSet );
+        Reader::ResetFrameFormatAttrs( rFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrmSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, rFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
     SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                rFrmSet );
-    SetSpace( aSpace, aItemSet, aPropInfo, rFrmSet );
+                rFrameSet );
+    SetSpace( aSpace, aItemSet, aPropInfo, rFrameSet );
 }
 #endif
 
@@ -784,7 +784,7 @@ void SwHTMLParser::EndApplet()
     pNoTextNd->SetTitle( m_pAppletImpl->GetAltText() );
 
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-    RegisterFlyFrm( pFlyFormat );
+    RegisterFlyFrame( pFlyFormat );
 
     delete m_pAppletImpl;
     m_pAppletImpl = nullptr;
@@ -929,23 +929,23 @@ void SwHTMLParser::InsertFloatingFrame()
         ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo );
 
     // den Itemset holen
-    SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+    SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
     if( !IsNewDoc() )
-        Reader::ResetFrameFormatAttrs( aFrmSet );
+        Reader::ResetFrameFormatAttrs( aFrameSet );
 
     // den Anker und die Ausrichtung setzen
-    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrmSet );
+    SetAnchorAndAdjustment( eVertOri, eHoriOri, aItemSet, aPropInfo, aFrameSet );
 
     // und noch die Groesse des Rahmens
     Size aDfltSz( HTML_DFLT_APPLET_WIDTH, HTML_DFLT_APPLET_HEIGHT );
     SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight, aItemSet, aPropInfo,
-                aFrmSet );
-    SetSpace( aSpace, aItemSet, aPropInfo, aFrmSet );
+                aFrameSet );
+    SetSpace( aSpace, aItemSet, aPropInfo, aFrameSet );
 
     // und in das Dok einfuegen
     SwFrameFormat* pFlyFormat =
-        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrmSet, nullptr, nullptr );
+        m_pDoc->getIDocumentContentOperations().Insert( *m_pPam, ::svt::EmbeddedObjectRef( xObj, embed::Aspects::MSOLE_CONTENT ), &aFrameSet, nullptr, nullptr );
 
     // den alternativen Namen setzen
     SwNoTextNode *pNoTextNd =
@@ -954,16 +954,16 @@ void SwHTMLParser::InsertFloatingFrame()
     pNoTextNd->SetTitle( aAlt );
 
     // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-    RegisterFlyFrm( pFlyFormat );
+    RegisterFlyFrame( pFlyFormat );
 
     m_bInFloatingFrame = true;
 }
 
-sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
+sal_uInt16 SwHTMLWriter::GuessOLENodeFrameType( const SwNode& rNode )
 {
     SwOLEObj& rObj = const_cast<SwOLENode*>(rNode.GetOLENode())->GetOLEObj();
 
-    SwHTMLFrmType eType = HTML_FRMTYPE_OLE;
+    SwHTMLFrameType eType = HTML_FRMTYPE_OLE;
 
     uno::Reference < embed::XClassifiedObject > xClass ( rObj.GetOleRef(), uno::UNO_QUERY );
     SvGlobalName aClass( xClass->getClassID() );
@@ -1013,7 +1013,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
         return rWrt;
     }
 
-    sal_uLong nFrmOpts;
+    sal_uLong nFrameOpts;
 
     // wenn meoglich vor dem "Objekt" einen Zeilen-Umbruch ausgeben
     if( rHTMLWrt.m_bLFPossible )
@@ -1065,12 +1065,12 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
         {
             // Das Plugin ist HIDDEN
             sOut.append(' ').append(OOO_STRING_SW_HTML_O_Hidden);
-            nFrmOpts = HTML_FRMOPTS_HIDDEN_EMBED;
+            nFrameOpts = HTML_FRMOPTS_HIDDEN_EMBED;
             bHiddenEmbed = true;
         }
         else
         {
-            nFrmOpts = bInCntnr ? HTML_FRMOPTS_EMBED_CNTNR
+            nFrameOpts = bInCntnr ? HTML_FRMOPTS_EMBED_CNTNR
                                 : HTML_FRMOPTS_EMBED;
         }
     }
@@ -1125,7 +1125,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
         if( bScript )
             sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_mayscript);
 
-        nFrmOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR
+        nFrameOpts = bInCntnr ? HTML_FRMOPTS_APPLET_CNTNR
                             : HTML_FRMOPTS_APPLET;
     }
     else
@@ -1140,7 +1140,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
                                         rHTMLWrt.m_eDestEnc,
                                         &rHTMLWrt.m_aNonConvertableCharacters );
 
-        nFrmOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR
+        nFrameOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR
                             : HTML_FRMOPTS_IFRAME;
     }
 
@@ -1148,10 +1148,10 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor
 
     // ALT, WIDTH, HEIGHT, HSPACE, VSPACE, ALIGN
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
-        nFrmOpts |= HTML_FRMOPTS_OLE_CSS1;
-    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrmOpts );
+        nFrameOpts |= HTML_FRMOPTS_OLE_CSS1;
+    OString aEndTags = rHTMLWrt.OutFrameFormatOptions( rFrameFormat, pOLENd->GetTitle(), nFrameOpts );
     if( rHTMLWrt.IsHTMLMode( HTMLMODE_ABS_POS_FLY ) && !bHiddenEmbed )
-        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrmOpts );
+        rHTMLWrt.OutCSS1_FrameFormatOptions( rFrameFormat, nFrameOpts );
 
     if( aGlobName == SvGlobalName( SO3_APPLET_CLASSID ) )
     {
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index b40c3ce4bc50..1907c71adf7c 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -313,26 +313,26 @@ void SwHTMLParser::NewDivision( int nToken )
             aSection.SetProtectFlag(true);
         }
 
-        SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
+        SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrameFormatAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
                                                    &pItem ) )
         {
-            aFrmItemSet.Put( *pItem );
+            aFrameItemSet.Put( *pItem );
             aItemSet.ClearItem( RES_BACKGROUND );
         }
         if( SfxItemState::SET == aItemSet.GetItemState( RES_FRAMEDIR, false,
                                                    &pItem ) )
         {
-            aFrmItemSet.Put( *pItem );
+            aFrameItemSet.Put( *pItem );
             aItemSet.ClearItem( RES_FRAMEDIR );
         }
 
-        m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrmItemSet, false );
+        m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrameItemSet, false );
 
         // ggfs. einen Bereich anspringen
         if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark )
@@ -591,7 +591,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
     bool bInCntnr = false;
     auto i = m_aContexts.size();
     while( !bInCntnr && i > m_nContextStMin )
-        bInCntnr = nullptr != m_aContexts[--i]->GetFrmItemSet();
+        bInCntnr = nullptr != m_aContexts[--i]->GetFrameItemSet();
 
     // Parse style sheets, but don't position anything by now.
     bool bStyleParsed = false;
@@ -618,26 +618,26 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
     bool bPositioned = false;
     if( bInCntnr || SwCSS1Parser::MayBePositioned( aPropInfo, true ) )
     {
-        SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
+        SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrameFormatAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
         SetAnchorAndAdjustment( text::VertOrientation::NONE, text::HoriOrientation::NONE, aItemSet, aPropInfo,
-                                aFrmItemSet );
+                                aFrameItemSet );
 
         // The width is either the WIDTH attribute's value or contained
         // in some style option.
-        SetVarSize( aItemSet, aPropInfo, aFrmItemSet, nTwipWidth, nPrcWidth );
+        SetVarSize( aItemSet, aPropInfo, aFrameItemSet, nTwipWidth, nPrcWidth );
 
-        SetSpace( Size(0,0), aItemSet, aPropInfo, aFrmItemSet );
+        SetSpace( Size(0,0), aItemSet, aPropInfo, aFrameItemSet );
 
         // 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.
         SetFrameFormatAttrs( aItemSet, aPropInfo,
                         HTML_FF_BOX|HTML_FF_BACKGROUND|HTML_FF_PADDING|HTML_FF_DIRECTION,
-                        aFrmItemSet );
+                        aFrameItemSet );
 
         // Insert fly frame. If the are columns, the fly frame's name is not
         // the sections name but a generated one.
@@ -648,7 +648,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
             aPropInfo.aId.clear();
         }
 
-        InsertFlyFrame( aFrmItemSet, pCntxt, aFlyName, CONTEXT_FLAGS_ABSPOS );
+        InsertFlyFrame( aFrameItemSet, pCntxt, aFlyName, CONTEXT_FLAGS_ABSPOS );
 
         pCntxt->SetPopStack( true );
         bPositioned = true;
@@ -690,10 +690,10 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         OUString aName( m_pDoc->GetUniqueSectionName( !aId.isEmpty() ? &aId : nullptr ) );
         SwSectionData aSection( CONTENT_SECTION, aName );
 
-        SfxItemSet aFrmItemSet( m_pDoc->GetAttrPool(),
+        SfxItemSet aFrameItemSet( m_pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
         if( !IsNewDoc() )
-            Reader::ResetFrameFormatAttrs(aFrmItemSet );
+            Reader::ResetFrameFormatAttrs(aFrameItemSet );
 
         if( nGutter && Application::GetDefaultDevice() )
         {
@@ -706,22 +706,22 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         nPrcWidth = 100;
 
         aFormatCol.Init( nCols, nGutter, USHRT_MAX );
-        aFrmItemSet.Put( aFormatCol );
+        aFrameItemSet.Put( aFormatCol );
 
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == aItemSet.GetItemState( RES_BACKGROUND, false,
                                                    &pItem ) )
         {
-            aFrmItemSet.Put( *pItem );
+            aFrameItemSet.Put( *pItem );
             aItemSet.ClearItem( RES_BACKGROUND );
         }
         if( SfxItemState::SET == aItemSet.GetItemState( RES_FRAMEDIR, false,
                                                    &pItem ) )
         {
-            aFrmItemSet.Put( *pItem );
+            aFrameItemSet.Put( *pItem );
             aItemSet.ClearItem( RES_FRAMEDIR );
         }
-        m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrmItemSet, false );
+        m_pDoc->InsertSwSection( *m_pPam, aSection, nullptr, &aFrameItemSet, false );
 
         // Jump to section, if this is requested.
         if( JUMPTO_REGION == m_eJumpTo && aName == m_sJmpMark )
@@ -778,7 +778,7 @@ void SwHTMLParser::InsertFlyFrame( const SfxItemSet& rItemSet,
     if( !rName.isEmpty() )
         pFlyFormat->SetName( rName );
 
-    RegisterFlyFrm( pFlyFormat );
+    RegisterFlyFrame( pFlyFormat );
 
     const SwFormatContent& rFlyContent = pFlyFormat->GetContent();
     const SwNodeIndex& rFlyCntIdx = *rFlyContent.GetContentIdx();
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 5e1fc096469f..0559b5f81a40 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -1400,10 +1400,10 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
         pFrameFormat = pBox->ClaimFrameFormat();
 
         // die Breite der Box berechnen
-        SwTwips nFrmWidth = (SwTwips)pLayoutInfo->GetColumn(nCol)
+        SwTwips nFrameWidth = (SwTwips)pLayoutInfo->GetColumn(nCol)
                                                 ->GetRelColWidth();
         for( sal_uInt16 i=1; i<nColSpan; i++ )
-            nFrmWidth += (SwTwips)pLayoutInfo->GetColumn(nCol+i)
+            nFrameWidth += (SwTwips)pLayoutInfo->GetColumn(nCol+i)
                                              ->GetRelColWidth();
 
         // die Umrandung nur an Edit-Boxen setzen (bei der oberen und unteren
@@ -1414,7 +1414,7 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
             bool bSet = (nCellPadding > 0);
 
             SvxBoxItem aBoxItem( RES_BOX );
-            long nInnerFrmWidth = nFrmWidth;
+            long nInnerFrameWidth = nFrameWidth;
 
             if( bTopLine )
             {
@@ -1453,13 +1453,13 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
                 const SvxBorderLine& rBorderLine =
                     0==nCol ? aLeftBorderLine : aBorderLine;
                 aBoxItem.SetLine( &rBorderLine, SvxBoxItemLine::LEFT );
-                nInnerFrmWidth -= GetBorderWidth( rBorderLine );
+                nInnerFrameWidth -= GetBorderWidth( rBorderLine );
                 bSet = true;
             }
             if( nCol+nColSpan == nCols && bRightBorder )
             {
                 aBoxItem.SetLine( &aRightBorderLine, SvxBoxItemLine::RIGHT );
-                nInnerFrmWidth -= GetBorderWidth( aRightBorderLine );
+                nInnerFrameWidth -= GetBorderWidth( aRightBorderLine );
                 bSet = true;
             }
 
@@ -1471,8 +1471,8 @@ void HTMLTable::FixFrameFormat( SwTableBox *pBox,
             {
                 // BorderDist nicht mehr Bestandteil einer Zelle mit fixer Breite
                 sal_uInt16 nBDist = static_cast< sal_uInt16 >(
-                    (2*nCellPadding <= nInnerFrmWidth) ? nCellPadding
-                                                      : (nInnerFrmWidth / 2) );
+                    (2*nCellPadding <= nInnerFrameWidth) ? nCellPadding
+                                                      : (nInnerFrameWidth / 2) );
                 // wir setzen das Item nur, wenn es eine Umrandung gibt
                 // oder eine sheet::Border-Distanz vorgegeben ist. Fehlt letztere,
                 // dann gibt es eine Umrandung, und wir muessen die Distanz
@@ -1670,7 +1670,7 @@ SwTableLine *HTMLTable::MakeTableLine( SwTableBox *pUpper,
             nRowHeight += GetTopCellSpace( nTopRow, 1, false ) +
                        GetBottomCellSpace( nTopRow, 1, false );
 
-            pFrameFormat->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nRowHeight ) );
+            pFrameFormat->SetFormatAttr( SwFormatFrameSize( ATT_MIN_SIZE, 0, nRowHeight ) );
         }
 
         if( pBGBrushItem )
@@ -2525,9 +2525,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
         if( bPrcWidth && text::HoriOrientation::FULL!=eHoriOri )
         {
             pFrameFormat->LockModify();
-            SwFormatFrmSize aFrmSize( pFrameFormat->GetFrmSize() );
-            aFrmSize.SetWidthPercent( (sal_uInt8)nWidth );
-            pFrameFormat->SetFormatAttr( aFrmSize );
+            SwFormatFrameSize aFrameSize( pFrameFormat->GetFrameSize() );
+            aFrameSize.SetWidthPercent( (sal_uInt8)nWidth );
+            pFrameFormat->SetFormatAttr( aFrameSize );
             pFrameFormat->UnlockModify();
         }
     }
@@ -2638,7 +2638,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
 
             (pSwTable->GetTabLines())[0]->ClaimFrameFormat();
             (pSwTable->GetTabLines())[0]->GetFrameFormat()
-                ->SetFormatAttr( SwFormatFrmSize( ATT_MIN_SIZE, 0, nHeight ) );
+                ->SetFormatAttr( SwFormatFrameSize( ATT_MIN_SIZE, 0, nHeight ) );
         }
 
         if( GetBGBrush() )
@@ -2662,9 +2662,9 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                 sal_uInt32 nMin = pLayoutInfo->GetMin();
                 if( nMin > USHRT_MAX )
                     nMin = USHRT_MAX;
-                SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
-                aFlyFrmSize.SetWidthPercent( 100 );
-                pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
+                SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMin, MINLAY );
+                aFlyFrameSize.SetWidthPercent( 100 );
+                pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize );
                 bIsInFlyFrame = false;
             }
             else
@@ -2679,8 +2679,8 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
                     sal_uInt32 nMax = pLayoutInfo->GetMax();
                     if( nMax > USHRT_MAX )
                         nMax = USHRT_MAX;
-                    SwFormatFrmSize aFlyFrmSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
-                    pContext->GetFrameFormat()->SetFormatAttr( aFlyFrmSize );
+                    SwFormatFrameSize aFlyFrameSize( ATT_VAR_SIZE, (SwTwips)nMax, MINLAY );
+                    pContext->GetFrameFormat()->SetFormatAttr( aFlyFrameSize );
                     bIsInFlyFrame = false;
                 }
                 else
@@ -3673,10 +3673,10 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                 {
                     // Die Tabelle soll in einen Rahmen geschaufelt werden.
 
-                    SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+                    SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                                         RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
                     if( !pCurTable->IsNewDoc() )
-                        Reader::ResetFrameFormatAttrs( aFrmSet );
+                        Reader::ResetFrameFormatAttrs( aFrameSet );
 
                     SwSurround eSurround = SURROUND_NONE;
                     sal_Int16 eHori;
@@ -3697,26 +3697,26 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
                         eHori = text::HoriOrientation::LEFT;
                         break;
                     }
-                    SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrmSet,
+                    SetAnchorAndAdjustment( text::VertOrientation::NONE, eHori, aFrameSet,
                                             true );
-                    aFrmSet.Put( SwFormatSurround(eSurround) );
+                    aFrameSet.Put( SwFormatSurround(eSurround) );
 
-                    SwFormatFrmSize aFrmSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
-                    aFrmSize.SetWidthPercent( 100 );
-                    aFrmSet.Put( aFrmSize );
+                    SwFormatFrameSize aFrameSize( ATT_VAR_SIZE, 20*MM50, MINLAY );
+                    aFrameSize.SetWidthPercent( 100 );
+                    aFrameSet.Put( aFrameSize );
 
                     sal_uInt16 nSpace = pCurTable->GetHSpace();
                     if( nSpace )
-                        aFrmSet.Put( SvxLRSpaceItem(nSpace,nSpace, 0, 0, RES_LR_SPACE) );
+                        aFrameSet.Put( SvxLRSpaceItem(nSpace,nSpace, 0, 0, RES_LR_SPACE) );
                     nSpace = pCurTable->GetVSpace();
                     if( nSpace )
-                        aFrmSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) );
+                        aFrameSet.Put( SvxULSpaceItem(nSpace,nSpace, RES_UL_SPACE) );
 
-                    RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrmSet.
+                    RndStdIds eAnchorId = static_cast<const SwFormatAnchor&>(aFrameSet.
                                                 Get( RES_ANCHOR )).
                                                 GetAnchorId();
                     SwFrameFormat *pFrameFormat =  m_pDoc->MakeFlySection(
-                                eAnchorId, m_pPam->GetPoint(), &aFrmSet );
+                                eAnchorId, m_pPam->GetPoint(), &aFrameSet );
 
                     pTCntxt->SetFrameFormat( pFrameFormat );
                     const SwFormatContent& rFlyContent = pFrameFormat->GetContent();
@@ -5006,17 +5006,17 @@ void _TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pD
 
         if( pTCntxt->GetFrameFormat() )
         {
-            pTCntxt->GetFrameFormat()->DelFrms();
-            pTableNd->DelFrms();
-            pTCntxt->GetFrameFormat()->MakeFrms();
+            pTCntxt->GetFrameFormat()->DelFrames();
+            pTableNd->DelFrames();
+            pTCntxt->GetFrameFormat()->MakeFrames();
         }
         else
         {
-            pTableNd->DelFrms();
+            pTableNd->DelFrames();
             SwNodeIndex aIdx( *pTableNd->EndOfSectionNode(), 1 );
             OSL_ENSURE( aIdx.GetIndex() <= pTCntxt->GetPos()->nNode.GetIndex(),
                     "unerwarteter Node fuer das Tabellen-Layout" );
-            pTableNd->MakeFrms( &aIdx );
+            pTableNd->MakeFrames( &aIdx );
         }
     }
 
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 3b3c8a457ce6..1773f8d6b42a 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -902,9 +902,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
     if( pFlyFrameFormat )
     {
         eSurround = pFlyFrameFormat->GetSurround().GetSurround();
-        const SwFormatFrmSize& rFrmSize = pFlyFrameFormat->GetFrmSize();
-        nFlyPrcWidth = rFrmSize.GetWidthPercent();
-        nFlyWidth = rFrmSize.GetSize().Width();
+        const SwFormatFrameSize& rFrameSize = pFlyFrameFormat->GetFrameSize();
+        nFlyPrcWidth = rFrameSize.GetWidthPercent();
+        nFlyWidth = rFrameSize.GetSize().Width();
 
         eFlyHoriOri = pFlyFrameFormat->GetHoriOrient().GetHoriOrient();
         if( text::HoriOrientation::NONE == eFlyHoriOri )
@@ -928,9 +928,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
 
     SwFrameFormat *pFormat = rTable.GetFrameFormat();
 
-    const SwFormatFrmSize& rFrmSize = pFormat->GetFrmSize();
-    long nWidth = rFrmSize.GetSize().Width();
-    sal_uInt8 nPrcWidth = rFrmSize.GetWidthPercent();
+    const SwFormatFrameSize& rFrameSize = pFormat->GetFrameSize();
+    long nWidth = rFrameSize.GetSize().Width();
+    sal_uInt8 nPrcWidth = rFrameSize.GetWidthPercent();
     sal_uInt16 nBaseWidth = (sal_uInt16)nWidth;
 
     sal_Int16 eTabHoriOri = pFormat->GetHoriOrient().GetHoriOrient();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 54cfe6767ba8..42c4ff1befd9 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -233,7 +233,7 @@ sal_uLong HTMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPam,
     return nRet;
 }
 
-SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
+SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCursor, SvStream& rIn,
                             const OUString& rPath,
                             const OUString& rBaseURL,
                             bool bReadNewDoc,
@@ -300,13 +300,13 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, SwPaM& rCrsr, SvStream& rIn,
 {
     m_nEventId = nullptr;
     m_bUpperSpace = m_bViewCreated = m_bChkJumpMark =
-    m_bSetCrsr = false;
+    m_bSetCursor = false;
 
     m_eScriptLang = HTML_SL_UNKNOWN;
     m_bAnyStarBasic = true;
 
-    rCrsr.DeleteMark();
-    m_pPam = &rCrsr; // re-use existing cursor: avoids spurious ~SwIndexReg assert
+    rCursor.DeleteMark();
+    m_pPam = &rCursor; // re-use existing cursor: avoids spurious ~SwIndexReg assert
     memset( &m_aAttrTab, 0, sizeof( _HTMLAttrTable ));
 
     // Die Font-Groessen 1-7 aus der INI-Datei lesen
@@ -761,16 +761,16 @@ if( m_pSttNdIdx->GetIndex()+1 == m_pPam->GetBound( false ).nNode.GetIndex() )
                         pCNd->EndOfSectionIndex() && !bHasFlysOrMarks )
                     {
                         SwViewShell *pVSh = CheckActionViewShell();
-                        SwCrsrShell *pCrsrSh = pVSh && dynamic_cast< const SwCrsrShell *>( pVSh ) !=  nullptr
-                                        ? static_cast < SwCrsrShell * >( pVSh )
+                        SwCursorShell *pCursorSh = pVSh && dynamic_cast< const SwCursorShell *>( pVSh ) !=  nullptr
+                                        ? static_cast < SwCursorShell * >( pVSh )
                                         : nullptr;
-                        if( pCrsrSh &&
-                            pCrsrSh->GetCrsr()->GetPoint()
+                        if( pCursorSh &&
+                            pCursorSh->GetCursor()->GetPoint()
                                    ->nNode.GetIndex() == nNodeIdx )
                         {
-                            pCrsrSh->MovePara(fnParaPrev, fnParaEnd );
-                            pCrsrSh->SetMark();
-                            pCrsrSh->ClearMark();
+                            pCursorSh->MovePara(fnParaPrev, fnParaEnd );
+                            pCursorSh->SetMark();
+                            pCursorSh->ClearMark();
                         }
                         m_pPam->GetBound().nContent.Assign( nullptr, 0 );
                         m_pPam->GetBound(false).nContent.Assign( nullptr, 0 );
@@ -2579,16 +2579,16 @@ SwViewShell *SwHTMLParser::CallEndAction( bool bChkAction, bool bChkPtr )
     if( !m_pActionViewShell || (bChkAction && !m_pActionViewShell->ActionPend()) )
         return m_pActionViewShell;
 
-    if( m_bSetCrsr )
+    if( m_bSetCursor )
     {
-        // set the cursor to the doc begin in all CrsrEditShells
+        // set the cursor to the doc begin in all CursorEditShells
         for(SwViewShell& rSh : m_pActionViewShell->GetRingContainer())
         {
-            if( dynamic_cast<const SwCrsrShell *>(&rSh) != nullptr )
-                static_cast<SwCrsrShell*>(&rSh)->SttEndDoc(true);
+            if( dynamic_cast<const SwCursorShell *>(&rSh) != nullptr )
+                static_cast<SwCursorShell*>(&rSh)->SttEndDoc(true);
         }
 
-        m_bSetCrsr = false;
+        m_bSetCursor = false;
     }
     if( dynamic_cast< const SwEditShell *>( m_pActionViewShell ) !=  nullptr )
     {
@@ -2891,9 +2891,9 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
         }
     }
 
-    for( auto n = m_aMoveFlyFrms.size(); n; )
+    for( auto n = m_aMoveFlyFrames.size(); n; )
     {
-        SwFrameFormat *pFrameFormat = m_aMoveFlyFrms[ --n ];
+        SwFrameFormat *pFrameFormat = m_aMoveFlyFrames[ --n ];
 
         const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
         OSL_ENSURE( FLY_AT_PARA == rAnchor.GetAnchorId(),
@@ -2916,7 +2916,7 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
         }
         if( bMoveFly )
         {
-            pFrameFormat->DelFrms();
+            pFrameFormat->DelFrames();
             *pAttrPam->GetPoint() = *pFlyPos;
             pAttrPam->GetPoint()->nContent.Assign( pAttrPam->GetContentNode(),
                                                    m_aMoveFlyCnts[n] );
@@ -2940,8 +2940,8 @@ void SwHTMLParser::_SetAttr( bool bChkEnd, bool bBeforeTable,
                 pFrameFormat->SetFormatAttr( aVertOri );
             }
 
-            pFrameFormat->MakeFrms();
-            m_aMoveFlyFrms.erase( m_aMoveFlyFrms.begin() + n );
+            pFrameFormat->MakeFrames();
+            m_aMoveFlyFrames.erase( m_aMoveFlyFrames.begin() + n );
             m_aMoveFlyCnts.erase( m_aMoveFlyCnts.begin() + n );
         }
     }
@@ -4875,13 +4875,13 @@ void SwHTMLParser::InsertSpacer()
             // einen leeren Textrahmen anlegen
 
             // den Itemset holen
-            SfxItemSet aFrmSet( m_pDoc->GetAttrPool(),
+            SfxItemSet aFrameSet( m_pDoc->GetAttrPool(),
                                 RES_FRMATR_BEGIN, RES_FRMATR_END-1 );
             if( !IsNewDoc() )
-                Reader::ResetFrameFormatAttrs( aFrmSet );
+                Reader::ResetFrameFormatAttrs( aFrameSet );
 
             // den Anker und die Ausrichtung setzen
-            SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrmSet );
+            SetAnchorAndAdjustment( eVertOri, eHoriOri, aFrameSet );
 
             // und noch die Groesse des Rahmens
             Size aDfltSz( MINFLY, MINFLY );
@@ -4891,21 +4891,21 @@ void SwHTMLParser::InsertSpacer()
             SvxCSS1PropertyInfo aDummyPropInfo;
 
             SetFixSize( aSize, aDfltSz, bPrcWidth, bPrcHeight,
-                        aDummyItemSet, aDummyPropInfo, aFrmSet );
-            SetSpace( aSpace, aDummyItemSet, aDummyPropInfo, aFrmSet );
+                        aDummyItemSet, aDummyPropInfo, aFrameSet );
+            SetSpace( aSpace, aDummyItemSet, aDummyPropInfo, aFrameSet );
 
             // den Inhalt schuetzen
             SvxProtectItem aProtectItem( RES_PROTECT) ;
             aProtectItem.SetContentProtect( true );
-            aFrmSet.Put( aProtectItem );
+            aFrameSet.Put( aProtectItem );
 
             // der Rahmen anlegen
             RndStdIds eAnchorId =
-                static_cast<const SwFormatAnchor &>(aFrmSet.Get(RES_ANCHOR)).GetAnchorId();
+                static_cast<const SwFormatAnchor &>(aFrameSet.Get(RES_ANCHOR)).GetAnchorId();
             SwFrameFormat *pFlyFormat = m_pDoc->MakeFlySection( eAnchorId,
-                                            m_pPam->GetPoint(), &aFrmSet );
+                                            m_pPam->GetPoint(), &aFrameSet );
             // Ggf Frames anlegen und auto-geb. Rahmen registrieren
-            RegisterFlyFrm( pFlyFormat );
+            RegisterFlyFrame( pFlyFormat );
         }
         break;
     case HTML_SPTYPE_VERT:
@@ -5015,7 +5015,7 @@ SwTwips SwHTMLParser::GetCurrentBrowseWidth()
     {
         const SwFrameFormat& rPgFormat = m_pCSS1Parser->GetMasterPageDesc()->GetMaster();
 
-        const SwFormatFrmSize& rSz   = rPgFormat.GetFrmSize();
+        const SwFormatFrameSize& rSz   = rPgFormat.GetFrameSize();
         const SvxLRSpaceItem& rLR = rPgFormat.GetLRSpace();
         const SvxULSpaceItem& rUL = rPgFormat.GetULSpace();
         const SwFormatCol& rCol = rPgFormat.GetCol();
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index da2a33aa64e1..376e68b61ed7 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -202,7 +202,7 @@ class _HTMLAttrContext
     OUString    aClass;          // die Klasse des Kontexts
 
     _HTMLAttrContext_SaveDoc *pSaveDocContext;
-    SfxItemSet *pFrmItemSet;
+    SfxItemSet *pFrameItemSet;
 
     sal_uInt16  nToken;         // das Token, zu dem der Kontext gehoehrt
 
@@ -234,7 +234,7 @@ public:
                       bool bDfltColl=false ) :
         aClass( rClass ),
         pSaveDocContext( nullptr ),
-        pFrmItemSet( nullptr ),
+        pFrameItemSet( nullptr ),
         nToken( nTokn ),
         nTextFormatColl( nPoolId ),
         nLeftMargin( 0 ),
@@ -256,7 +256,7 @@ public:
 
     explicit _HTMLAttrContext( sal_uInt16 nTokn ) :
         pSaveDocContext( nullptr ),
-        pFrmItemSet( nullptr ),
+        pFrameItemSet( nullptr ),
         nToken( nTokn ),
         nTextFormatColl( 0 ),
         nLeftMargin( 0 ),
@@ -276,7 +276,7 @@ public:
         bRestartListing( false )
     {}
 
-    ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrmItemSet; }
+    ~_HTMLAttrContext() { ClearSaveDocContext(); delete pFrameItemSet; }
 
     sal_uInt16 GetToken() const { return nToken; }
 
@@ -308,8 +308,8 @@ public:
     bool HasSaveDocContext() const { return pSaveDocContext!=nullptr; }
     _HTMLAttrContext_SaveDoc *GetSaveDocContext( bool bCreate=false );
 
-    const SfxItemSet *GetFrmItemSet() const { return pFrmItemSet; }
-    SfxItemSet *GetFrmItemSet( SwDoc *pCreateDoc );
+    const SfxItemSet *GetFrameItemSet() const { return pFrameItemSet; }
+    SfxItemSet *GetFrameItemSet( SwDoc *pCreateDoc );
 
     void SetFinishPREListingXMP( bool bSet ) { bFinishPREListingXMP = bSet; }
     bool IsFinishPREListingXMP() const { return bFinishPREListingXMP; }
@@ -381,7 +381,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     _HTMLAttrs      m_aParaAttrs; // vorlauefige Absatz-Attribute
     _HTMLAttrTable  m_aAttrTab;   // "offene" Attribute
     _HTMLAttrContexts m_aContexts;// der aktuelle Attribut/Token-Kontext
-    std::vector<SwFrameFormat *> m_aMoveFlyFrms;// Fly-Frames, the anchor is moved
+    std::vector<SwFrameFormat *> m_aMoveFlyFrames;// Fly-Frames, the anchor is moved
     std::deque<sal_Int32> m_aMoveFlyCnts;// and the Content-Positions
 
     SwApplet_Impl *m_pAppletImpl; // das aktuelle Applet
@@ -438,7 +438,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
                                 // Flag um doppeltes init durch Rekursion
                                 // zu verhindern.
     bool m_bViewCreated : 1;      // die View wurde schon erzeugt (asynchron)
-    bool m_bSetCrsr : 1;          // Crsr wieder auf den Anfang setzen
+    bool m_bSetCursor : 1;          // Cursor wieder auf den Anfang setzen
     bool m_bSetModEnabled : 1;
 
     bool m_bInFloatingFrame : 1;  // Wir sind in einen Floating Frame
@@ -493,7 +493,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
     inline void SetAttr( bool bChkEnd = true, bool bBeforeTable = false,
                          _HTMLAttrs *pPostIts = nullptr )
     {
-        if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrms.empty() )
+        if( !m_aSetAttrTab.empty() || !m_aMoveFlyFrames.empty() )
             _SetAttr( bChkEnd, bBeforeTable, pPostIts );
     }
 
@@ -667,20 +667,20 @@ private:
                                  sal_Int16 eHoriOri,
                                  const SfxItemSet &rItemSet,
                                  const SvxCSS1PropertyInfo &rPropInfo,
-                                 SfxItemSet& rFrmSet );
+                                 SfxItemSet& rFrameSet );
     void SetAnchorAndAdjustment( sal_Int16 eVertOri,
                                  sal_Int16 eHoriOri,
-                                 SfxItemSet& rFrmSet,
+                                 SfxItemSet& rFrameSet,
                                  bool bDontAppend=false );
     void SetAnchorAndAdjustment( const SfxItemSet &rItemSet,
                                  const SvxCSS1PropertyInfo &rPropInfo,
-                                 SfxItemSet &rFrmItemSet );
+                                 SfxItemSet &rFrameItemSet );
 
     static void SetFrameFormatAttrs( SfxItemSet &rItemSet, SvxCSS1PropertyInfo &rPropInfo,
-                         sal_uInt16 nFlags, SfxItemSet &rFrmItemSet );
+                         sal_uInt16 nFlags, SfxItemSet &rFrameItemSet );
 
     // Frames anlegen und Auto-gebundene Rahmen registrieren
-    void RegisterFlyFrm( SwFrameFormat *pFlyFrm );
+    void RegisterFlyFrame( SwFrameFormat *pFlyFrame );
 
     // Die Groesse des Fly-Frames an die Vorgaben und Gegebenheiten anpassen
     // (nicht fuer Grafiken, deshalb htmlplug.cxx)
@@ -884,7 +884,7 @@ protected:
 
 public:
 
-    SwHTMLParser( SwDoc* pD, SwPaM & rCrsr, SvStream& rIn,
+    SwHTMLParser( SwDoc* pD, SwPaM & rCursor, SvStream& rIn,
                     const OUString& rFileName,
                     const OUString& rBaseURL,
                     bool bReadNewDoc = true,
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index f66e87631f12..e741ee631b5a 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -91,7 +91,7 @@ static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
     "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t";
 
 SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL )
-    : m_pHTMLPosFlyFrms(nullptr)
+    : m_pHTMLPosFlyFrames(nullptr)
     , m_pNumRuleInfo(new SwHTMLNumRuleInfo)
     , m_pNextNumRuleInfo(nullptr)
     , m_nHTMLMode(0)
@@ -378,8 +378,8 @@ sal_uLong SwHTMLWriter::WriteStream()
 
     // Tabelle fuer die freifliegenden Rahmen erzeugen, aber nur wenn
     // das gesamte Dokument geschrieben wird
-    m_pHTMLPosFlyFrms = nullptr;
-    CollectFlyFrms();
+    m_pHTMLPosFlyFrames = nullptr;
+    CollectFlyFrames();
     m_nLastParaToken = 0;
     GetControls();
     CollectLinkTargets();
@@ -438,12 +438,12 @@ sal_uLong SwHTMLWriter::WriteStream()
     }
 
     // loesche die Tabelle mit den freifliegenden Rahmen
-    OSL_ENSURE( !m_pHTMLPosFlyFrms, "Wurden nicht alle Rahmen ausgegeben" );
-    if( m_pHTMLPosFlyFrms )
+    OSL_ENSURE( !m_pHTMLPosFlyFrames, "Wurden nicht alle Rahmen ausgegeben" );
+    if( m_pHTMLPosFlyFrames )
     {
-        m_pHTMLPosFlyFrms->DeleteAndDestroyAll();
-        delete m_pHTMLPosFlyFrms;
-        m_pHTMLPosFlyFrms = nullptr;
+        m_pHTMLPosFlyFrames->DeleteAndDestroyAll();
+        delete m_pHTMLPosFlyFrames;
+        m_pHTMLPosFlyFrames = nullptr;
     }
 
     m_aHTMLControls.DeleteAndDestroyAll();
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 8a65c8128ae6..03d891f57866 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -52,7 +52,7 @@ class SdrUnoObj;
 class SvxBrushItem;
 class SvxFontItem;
 class SwHTMLNumRuleInfo;
-class SwHTMLPosFlyFrms;
+class SwHTMLPosFlyFrames;
 class SwTextFootnote;
 
 typedef std::vector<SwTextFootnote*> SwHTMLTextFootnotes;
@@ -260,7 +260,7 @@ class IDocumentStylePoolAccess;
 
 class SwHTMLWriter : public Writer
 {
-    SwHTMLPosFlyFrms *m_pHTMLPosFlyFrms;
+    SwHTMLPosFlyFrames *m_pHTMLPosFlyFrames;
     SwHTMLNumRuleInfo *m_pNumRuleInfo;// aktuelle Numerierung
     SwHTMLNumRuleInfo *m_pNextNumRuleInfo;
     sal_uInt32 m_nHTMLMode;               // Beschreibung der Export-Konfiguration
@@ -414,7 +414,7 @@ public:
     void OutHyperlinkHRefValue( const OUString& rURL );
 
     // gebe die evt. an der akt. Position stehenden FlyFrame aus.
-    bool OutFlyFrm( sal_uLong nNdIdx, sal_Int32 nContentIdx,
+    bool OutFlyFrame( sal_uLong nNdIdx, sal_Int32 nContentIdx,
                         sal_uInt8 nPos, HTMLOutContext *pContext = nullptr );
     void OutFrameFormat( sal_uInt8 nType, const SwFrameFormat& rFormat,
                     const SdrObject *pSdrObj );
@@ -468,14 +468,14 @@ public:
     // Frame-Formats ausgeben und ggf. ein <BR CLEAR=...> vorne an
     // rEndTags anhaengen
     OString OutFrameFormatOptions( const SwFrameFormat& rFrameFormat, const OUString& rAltText,
-        sal_uInt32 nFrmOpts, const OString& rEndTags = OString() );
+        sal_uInt32 nFrameOpts, const OString& rEndTags = OString() );
 
-    void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrmOpts);
+    void writeFrameFormatOptions(HtmlWriter& aHtml, const SwFrameFormat& rFrameFormat, const OUString& rAltText, sal_uInt32 nFrameOpts);
 
     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,
+    void OutCSS1_FrameFormatOptions( const SwFrameFormat& rFrameFormat, sal_uInt32 nFrameOpts,
                                 const SdrObject *pSdrObj=nullptr,
                                 const SfxItemSet *pItemSet=nullptr );
     void OutCSS1_FrameFormatBackground( const SwFrameFormat& rFrameFormat );
@@ -504,11 +504,11 @@ public:
 
     static sal_uInt32 ToPixel( sal_uInt32 nVal, const bool bVert );
 
-    sal_uInt16 GuessFrmType( const SwFrameFormat& rFrameFormat,
+    sal_uInt16 GuessFrameType( const SwFrameFormat& rFrameFormat,
                          const SdrObject*& rpStrObj );
-    static sal_uInt16 GuessOLENodeFrmType( const SwNode& rNd );
+    static sal_uInt16 GuessOLENodeFrameType( const SwNode& rNd );
 
-    void CollectFlyFrms();
+    void CollectFlyFrames();
 
     sal_uInt16 GetHTMLFontSize( sal_uInt32 nFontHeight ) const;
 
@@ -649,7 +649,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrameFormat& rFrameFormat,
 
 Writer& OutHTML_Image( Writer&, const SwFrameFormat& rFormat,
                        Graphic& rGraphic, const OUString& rAlternateText,
-                       const Size& rRealSize, sal_uInt32 nFrmOpts,
+                       const Size& rRealSize, sal_uInt32 nFrameOpts,
                        const sal_Char *pMarkType = nullptr,
                        const ImageMap *pGenImgMap = nullptr );