bin/rename-sw-abbreviations.sh libreoffice-5-0-branch-point

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

Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9

3 files changed, 34 insertions, 34 deletions

diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index a6ebb7b2fa13..be8088afaea8 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -198,7 +198,7 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndId
     SwNodes *const pNds = &rDoc.GetNodes();
 
     SwNodeIndex aStt( *pNds, nStartIdx );
-    SwCntntNode* pCNode = aStt.GetNode().GetCntntNode();
+    SwContentNode* pCNode = aStt.GetNode().GetContentNode();
     if( !pCNode && 0 == pNds->GoNext( &aStt ) )
     {
         OSL_FAIL( "No more ContentNode at StartPos" );
@@ -207,7 +207,7 @@ Writer::NewSwPaM(SwDoc & rDoc, sal_uLong const nStartIdx, sal_uLong const nEndId
     SwPaM* pNew = new SwPaM( aStt );
     pNew->SetMark();
     aStt = nEndIdx;
-    pCNode = aStt.GetNode().GetCntntNode();
+    pCNode = aStt.GetNode().GetContentNode();
     if (!pCNode)
         pCNode = SwNodes::GoPrevious(&aStt);
     assert(pCNode && "No more ContentNode at StartPos");
@@ -300,26 +300,26 @@ sal_uLong Writer::Write( SwPaM&, const uno::Reference < embed::XStorage >&, cons
     return ERR_SWG_WRITE_ERROR;
 }
 
-void Writer::PutNumFmtFontsInAttrPool()
+void Writer::PutNumFormatFontsInAttrPool()
 {
     // then there are a few fonts in the NumRules
     // These put into the Pool. After this does they have a RefCount > 1
     // it can be removed - it is already in the Pool
     SfxItemPool& rPool = pDoc->GetAttrPool();
-    const SwNumRuleTbl& rListTbl = pDoc->GetNumRuleTbl();
+    const SwNumRuleTable& rListTable = pDoc->GetNumRuleTable();
     const SwNumRule* pRule;
-    const SwNumFmt* pFmt;
+    const SwNumFormat* pFormat;
     const vcl::Font* pFont;
     const vcl::Font* pDefFont = &numfunc::GetDefBulletFont();
     bool bCheck = false;
 
-    for( size_t nGet = rListTbl.size(); nGet; )
-        if( SwDoc::IsUsed( *(pRule = rListTbl[ --nGet ] )))
+    for( size_t nGet = rListTable.size(); nGet; )
+        if( SwDoc::IsUsed( *(pRule = rListTable[ --nGet ] )))
             for( sal_uInt8 nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
-                if( SVX_NUM_CHAR_SPECIAL == (pFmt = &pRule->Get( nLvl ))->GetNumberingType() ||
-                    SVX_NUM_BITMAP == pFmt->GetNumberingType() )
+                if( SVX_NUM_CHAR_SPECIAL == (pFormat = &pRule->Get( nLvl ))->GetNumberingType() ||
+                    SVX_NUM_BITMAP == pFormat->GetNumberingType() )
                 {
-                    if( 0 == ( pFont = pFmt->GetBulletFont() ) )
+                    if( 0 == ( pFont = pFormat->GetBulletFont() ) )
                         pFont = pDefFont;
 
                     if( bCheck )
@@ -386,7 +386,7 @@ void Writer::_AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont )
 
 // build a bookmark table, which is sort by the node position. The
 // OtherPos of the bookmarks also inserted.
-void Writer::CreateBookmarkTbl()
+void Writer::CreateBookmarkTable()
 {
     const IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
     for(IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->getBookmarksBegin();
@@ -398,7 +398,7 @@ void Writer::CreateBookmarkTbl()
 }
 
 // search alle Bookmarks in the range and return it in the Array
-bool Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
+bool Writer::GetBookmarks(const SwContentNode& rNd, sal_Int32 nStt,
     sal_Int32 nEnd, std::vector< const ::sw::mark::IMark* >& rArr)
 {
     OSL_ENSURE( rArr.empty(), "there are still entries available" );
@@ -418,17 +418,17 @@ bool Writer::GetBookmarks(const SwCntntNode& rNd, sal_Int32 nStt,
             for( SwBookmarkNodeTable::const_iterator it = aIterPair.first; it != aIterPair.second; ++it )
             {
                 const ::sw::mark::IMark& rBkmk = *(it->second);
-                sal_Int32 nCntnt;
+                sal_Int32 nContent;
                 if( rBkmk.GetMarkPos().nNode == nNd &&
-                    (nCntnt = rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt &&
-                    nCntnt < nEnd )
+                    (nContent = rBkmk.GetMarkPos().nContent.GetIndex() ) >= nStt &&
+                    nContent < nEnd )
                 {
                     rArr.push_back( &rBkmk );
                 }
                 else if( rBkmk.IsExpanded() && nNd ==
-                        rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nCntnt =
+                        rBkmk.GetOtherMarkPos().nNode.GetIndex() && (nContent =
                         rBkmk.GetOtherMarkPos().nContent.GetIndex() ) >= nStt &&
-                        nCntnt < nEnd )
+                        nContent < nEnd )
                 {
                     rArr.push_back( &rBkmk );
                 }
diff --git a/sw/source/filter/writer/wrt_fn.cxx b/sw/source/filter/writer/wrt_fn.cxx
index 979a3cc1bfb9..de5a7c17e1bc 100644
--- a/sw/source/filter/writer/wrt_fn.cxx
+++ b/sw/source/filter/writer/wrt_fn.cxx
@@ -86,8 +86,8 @@ Writer& Out_SfxItemSet( const SwAttrFnTab pTab, Writer& rWrt,
 
 Writer& Out( const SwNodeFnTab pTab, SwNode& rNode, Writer & rWrt )
 {
-    // It must be a CntntNode!
-    SwCntntNode * pCNd = rNode.GetCntntNode();
+    // It must be a ContentNode!
+    SwContentNode * pCNd = rNode.GetContentNode();
     if( !pCNd )
         return rWrt;
 
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index ec8b945888f7..44595b7a9215 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -37,12 +37,12 @@ sal_Int16 SwWriteTableCell::GetVertOri() const
     sal_Int16 eCellVertOri = text::VertOrientation::TOP;
     if( pBox->GetSttNd() )
     {
-        const SfxItemSet& rItemSet = pBox->GetFrmFmt()->GetAttrSet();
+        const SfxItemSet& rItemSet = pBox->GetFrameFormat()->GetAttrSet();
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) )
         {
             sal_Int16 eBoxVertOri =
-                static_cast<const SwFmtVertOrient *>(pItem)->GetVertOrient();
+                static_cast<const SwFormatVertOrient *>(pItem)->GetVertOrient();
             if( text::VertOrientation::CENTER==eBoxVertOri || text::VertOrientation::BOTTOM==eBoxVertOri)
                 eCellVertOri = eBoxVertOri;
         }
@@ -80,9 +80,9 @@ SwWriteTableCol::SwWriteTableCol(sal_uInt32 nPosition)
 
 sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
 {
-    const SwFrmFmt *pFmt = pBox->GetFrmFmt();
-    const SwFmtFrmSize& aFrmSize=
-        static_cast<const SwFmtFrmSize&>(pFmt->GetFmtAttr( RES_FRM_SIZE ));
+    const SwFrameFormat *pFormat = pBox->GetFrameFormat();
+    const SwFormatFrmSize& aFrmSize=
+        static_cast<const SwFormatFrmSize&>(pFormat->GetFormatAttr( RES_FRM_SIZE ));
 
     return sal::static_int_cast<sal_uInt32>(aFrmSize.GetSize().Width());
 }
@@ -148,13 +148,13 @@ long SwWriteTable::GetLineHeight( const SwTableBox *pBox )
     if( !pLine )
         return 0;
 
-    const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+    const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
     const SfxPoolItem* pItem;
-    const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+    const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
     long nHeight = 0;
     if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ))
-        nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight();
+        nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight();
 
     return nHeight;
 }
@@ -166,9 +166,9 @@ const SvxBrushItem *SwWriteTable::GetLineBrush( const SwTableBox *pBox,
 
     while( pLine )
     {
-        const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+        const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
         const SfxPoolItem* pItem;
-        const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+        const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
         if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false,
                                                    &pItem ) )
@@ -229,8 +229,8 @@ sal_uInt16 SwWriteTable::MergeBoxBorders( const SwTableBox *pBox,
 {
     sal_uInt16 nBorderMask = 0;
 
-    const SwFrmFmt *pFrmFmt = pBox->GetFrmFmt();
-    const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(pFrmFmt->GetFmtAttr( RES_BOX ));
+    const SwFrameFormat *pFrameFormat = pBox->GetFrameFormat();
+    const SvxBoxItem& rBoxItem = static_cast<const SvxBoxItem&>(pFrameFormat->GetFormatAttr( RES_BOX ));
 
     if( rBoxItem.GetTop() )
     {
@@ -584,13 +584,13 @@ void SwWriteTable::FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
 
         const SwTableBoxes& rBoxes = pLine->GetTabBoxes();
 
-        const SwFrmFmt *pLineFrmFmt = pLine->GetFrmFmt();
+        const SwFrameFormat *pLineFrameFormat = pLine->GetFrameFormat();
         const SfxPoolItem* pItem;
-        const SfxItemSet& rItemSet = pLineFrmFmt->GetAttrSet();
+        const SfxItemSet& rItemSet = pLineFrameFormat->GetAttrSet();
 
         long nHeight = 0;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ))
-            nHeight = static_cast<const SwFmtFrmSize*>(pItem)->GetHeight();
+            nHeight = static_cast<const SwFormatFrmSize*>(pItem)->GetHeight();
 
         const SvxBrushItem *pBrushItem, *pLineBrush = pParentBrush;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_BACKGROUND, false,