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, 40 insertions, 40 deletions

diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index 397d5fb55dfe..de12203c955b 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -425,7 +425,7 @@ void SwColumnOnlyExample::Paint(vcl::RenderContext& rRenderContext, const Rectan
     }
 }
 
-void  SwColumnOnlyExample::SetColumns(const SwFmtCol& rCol)
+void  SwColumnOnlyExample::SetColumns(const SwFormatCol& rCol)
 {
     m_aCols = rCol;
     sal_uInt16 nWishSum = m_aCols.GetWishWidth();
diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx
index 3f040b844358..12773f181ce6 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -27,7 +27,7 @@
 // private methods
 
 // set column width to current width
-void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
+void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth)
 {
     const sal_uInt16 nCount = rCol.GetColumns().size();
     for(sal_uInt16 i = 0; i < nCount; ++i)
@@ -43,20 +43,20 @@ void FitToActualSize(SwFmtCol& rCol, sal_uInt16 nWidth)
 // set column quantity and Gutterwidth
 void SwColMgr::SetCount(sal_uInt16 nCount, sal_uInt16  nGutterWidth)
 {
-    aFmtCol.Init(nCount, nGutterWidth, nWidth);
-    aFmtCol.SetWishWidth(nWidth);
-    aFmtCol.SetGutterWidth(nGutterWidth, nWidth);
+    aFormatCol.Init(nCount, nGutterWidth, nWidth);
+    aFormatCol.SetWishWidth(nWidth);
+    aFormatCol.SetGutterWidth(nGutterWidth, nWidth);
 }
 
 sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const
 {
     sal_uInt16 nRet;
     if(nPos == USHRT_MAX )
-        nRet = GetCount() > 1 ? aFmtCol.GetGutterWidth() : DEF_GUTTER_WIDTH;
+        nRet = GetCount() > 1 ? aFormatCol.GetGutterWidth() : DEF_GUTTER_WIDTH;
     else
     {
         OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" );
-        const SwColumns& rCols = aFmtCol.GetColumns();
+        const SwColumns& rCols = aFormatCol.GetColumns();
         nRet = rCols[nPos].GetRight() + rCols[nPos + 1].GetLeft();
     }
     return nRet;
@@ -65,11 +65,11 @@ sal_uInt16 SwColMgr::GetGutterWidth( sal_uInt16 nPos ) const
 void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos )
 {
     if(nPos == USHRT_MAX)
-        aFmtCol.SetGutterWidth(nGutterWidth, nWidth);
+        aFormatCol.SetGutterWidth(nGutterWidth, nWidth);
     else
     {
         OSL_ENSURE(nPos < GetCount() - 1, "Spalte ueberindiziert" );
-        SwColumns& rCols = aFmtCol.GetColumns();
+        SwColumns& rCols = aFormatCol.GetColumns();
         sal_uInt16 nGutterWidth2 = nGutterWidth / 2;
         rCols[nPos].SetRight(nGutterWidth2);
         rCols[nPos + 1].SetLeft(nGutterWidth2);
@@ -79,25 +79,25 @@ void SwColMgr::SetGutterWidth(sal_uInt16 nGutterWidth, sal_uInt16 nPos )
 // height separation line
 short SwColMgr::GetLineHeightPercent() const
 {
-    return (short)aFmtCol.GetLineHeight();
+    return (short)aFormatCol.GetLineHeight();
 }
 void SwColMgr::SetLineHeightPercent(short nPercent)
 {
     OSL_ENSURE(nPercent <= 100, "line height may be at most 100%");
-    aFmtCol.SetLineHeight((sal_uInt8)nPercent);
+    aFormatCol.SetLineHeight((sal_uInt8)nPercent);
 }
 
 // column width
 sal_uInt16 SwColMgr::GetColWidth(sal_uInt16 nIdx) const
 {
     OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert.");
-    return aFmtCol.CalcPrtColWidth(nIdx, nWidth);
+    return aFormatCol.CalcPrtColWidth(nIdx, nWidth);
 }
 
 void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd)
 {
     OSL_ENSURE(nIdx < GetCount(), "Spaltenarray ueberindiziert.");
-    aFmtCol.GetColumns()[nIdx].SetWishWidth(nWd);
+    aFormatCol.GetColumns()[nIdx].SetWishWidth(nWd);
 
 }
 
@@ -105,24 +105,24 @@ void SwColMgr::SetColWidth(sal_uInt16 nIdx, sal_uInt16 nWd)
 void SwColMgr::SetActualWidth(sal_uInt16 nW)
 {
     nWidth = nW;
-    ::FitToActualSize(aFmtCol, nW);
+    ::FitToActualSize(aFormatCol, nW);
 }
 
 // ctor
 SwColMgr::SwColMgr(const SfxItemSet& rSet, sal_uInt16 nActWidth) :
-    aFmtCol(static_cast<const SwFmtCol&>(rSet.Get(RES_COL))),
+    aFormatCol(static_cast<const SwFormatCol&>(rSet.Get(RES_COL))),
     nWidth(nActWidth)
 {
     if(nWidth == USHRT_MAX)
     {
-        nWidth = (sal_uInt16)static_cast<const SwFmtFrmSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth();
+        nWidth = (sal_uInt16)static_cast<const SwFormatFrmSize&>(rSet.Get(RES_FRM_SIZE)).GetWidth();
         if (nWidth < MINLAY)
             nWidth = USHRT_MAX;
         const SvxLRSpaceItem &rLR = static_cast<const SvxLRSpaceItem&>(rSet.Get(RES_LR_SPACE));
         nWidth = nWidth - (sal_uInt16)rLR.GetLeft();
         nWidth = nWidth - (sal_uInt16)rLR.GetRight();
     }
-    ::FitToActualSize(aFmtCol, nWidth);
+    ::FitToActualSize(aFormatCol, nWidth);
 }
 
 SwColMgr::~SwColMgr()
@@ -131,9 +131,9 @@ SwColMgr::~SwColMgr()
 
 void SwColMgr::SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nLWidth, const Color& rCol)
 {
-    aFmtCol.SetLineStyle(eStyle);
-    aFmtCol.SetLineWidth(nLWidth);
-    aFmtCol.SetLineColor(rCol);
+    aFormatCol.SetLineStyle(eStyle);
+    aFormatCol.SetLineWidth(nLWidth);
+    aFormatCol.SetLineColor(rCol);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 925bd67b5b83..bd3c326429f0 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -74,10 +74,10 @@ SwFlyFrmAttrMgr::SwFlyFrmAttrMgr( bool bNew, SwWrtShell* pSh, sal_uInt8 nType )
             case FRMMGR_TYPE_OLE:   nId = RES_POOLFRM_OLE;      break;
             case FRMMGR_TYPE_GRF:   nId = RES_POOLFRM_GRAPHIC;  break;
         }
-        m_aSet.SetParent( &m_pOwnSh->GetFmtFromPool( nId )->GetAttrSet());
-        m_aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
+        m_aSet.SetParent( &m_pOwnSh->GetFormatFromPool( nId )->GetAttrSet());
+        m_aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE, DFLT_WIDTH, DFLT_HEIGHT ));
         if ( 0 != ::GetHtmlMode(pSh->GetView().GetDocShell()) )
-            m_aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::PRINT_AREA ) );
+            m_aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::PRINT_AREA ) );
     }
     else if ( nType == FRMMGR_TYPE_NONE )
     {
@@ -142,8 +142,8 @@ void SwFlyFrmAttrMgr::UpdateFlyFrm()
             SfxItemSet aGetSet( *m_aSet.GetPool(), RES_ANCHOR, RES_ANCHOR );
             if( m_pOwnSh->GetFlyFrmAttr( aGetSet ) && 1 == aGetSet.Count() &&
                 SfxItemState::SET == aGetSet.GetItemState( RES_ANCHOR, false, &pGItem )
-                && static_cast<const SwFmtAnchor*>(pGItem)->GetAnchorId() ==
-                   static_cast<const SwFmtAnchor*>(pItem)->GetAnchorId() )
+                && static_cast<const SwFormatAnchor*>(pGItem)->GetAnchorId() ==
+                   static_cast<const SwFormatAnchor*>(pItem)->GetAnchorId() )
                 m_aSet.ClearItem( RES_ANCHOR );
         }
 
@@ -205,12 +205,12 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
     sal_uInt16 nPhyPageNum, nVirtPageNum;
     m_pOwnSh->GetPageNum( nPhyPageNum, nVirtPageNum );
 
-    m_aSet.Put( SwFmtAnchor( eId, nPhyPageNum ) );
+    m_aSet.Put( SwFormatAnchor( eId, nPhyPageNum ) );
     if ((FLY_AT_PAGE == eId) || (FLY_AT_PARA == eId) || (FLY_AT_CHAR == eId)
         || (FLY_AT_FLY == eId))
     {
-        SwFmtVertOrient aVertOrient( GetVertOrient() );
-        SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+        SwFormatVertOrient aVertOrient( GetVertOrient() );
+        SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
         aHoriOrient.SetRelationOrient( text::RelOrientation::FRAME );
         aVertOrient.SetRelationOrient( text::RelOrientation::FRAME );
         m_aSet.Put( aVertOrient );
@@ -219,7 +219,7 @@ void SwFlyFrmAttrMgr::SetAnchor( RndStdIds eId )
 }
 
 // set the attribute for columns
-void SwFlyFrmAttrMgr::SetCol( const SwFmtCol &rCol )
+void SwFlyFrmAttrMgr::SetCol( const SwFormatCol &rCol )
 {
     m_aSet.Put( rCol );
 }
@@ -229,8 +229,8 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 {
     m_bAbsPos = true;
     m_aAbsPos = rPoint;
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
     aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE );
     aVertOrient.SetVertOrient( text::VertOrientation::NONE );
     m_aSet.Put( aVertOrient );
@@ -239,7 +239,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint )
 
 // check metrics for correctness
 void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
-        const SwPosition* pToCharCntntPos,
+        const SwPosition* pToCharContentPos,
         bool bOnlyPercentRefValue )
 {
     if (!bOnlyPercentRefValue)
@@ -253,11 +253,11 @@ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal,
     // OD 18.09.2003 #i18732# - adjustment for allowing vertical position
     //      aligned to page for fly frame anchored to paragraph or to character.
     const RndStdIds eAnchorType = static_cast<RndStdIds >(rVal.nAnchorType);
-    const SwFmtFrmSize& rSize = static_cast<const SwFmtFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
+    const SwFormatFrmSize& rSize = static_cast<const SwFormatFrmSize&>(m_aSet.Get(RES_FRM_SIZE));
     m_pOwnSh->CalcBoundRect( aBoundRect, eAnchorType,
                            rVal.nHRelOrient,
                            rVal.nVRelOrient,
-                           pToCharCntntPos,
+                           pToCharContentPos,
                            rVal.bFollowTextFlow,
                            rVal.bMirror, NULL, &rVal.aPercentSize,
                            &rSize);
@@ -539,8 +539,8 @@ void SwFlyFrmAttrMgr::SetULSpace( long nTop, long nBottom )
 
 void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
 {
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
 
     aHoriOrient.SetPos       ( rPoint.X() );
     aHoriOrient.SetHoriOrient( text::HoriOrientation::NONE  );
@@ -554,28 +554,28 @@ void SwFlyFrmAttrMgr::SetPos( const Point& rPoint )
 
 void SwFlyFrmAttrMgr::SetHorzOrientation( sal_Int16 eOrient )
 {
-    SwFmtHoriOrient aHoriOrient( GetHoriOrient() );
+    SwFormatHoriOrient aHoriOrient( GetHoriOrient() );
     aHoriOrient.SetHoriOrient( eOrient );
     m_aSet.Put( aHoriOrient );
 }
 
 void SwFlyFrmAttrMgr::SetVertOrientation( sal_Int16 eOrient )
 {
-    SwFmtVertOrient aVertOrient( GetVertOrient() );
+    SwFormatVertOrient aVertOrient( GetVertOrient() );
     aVertOrient.SetVertOrient( eOrient );
     m_aSet.Put( aVertOrient );
 }
 
 void SwFlyFrmAttrMgr::SetHeightSizeType( SwFrmSize eType )
 {
-    SwFmtFrmSize aSize( GetFrmSize() );
+    SwFormatFrmSize aSize( GetFrmSize() );
     aSize.SetHeightSizeType( eType );
     m_aSet.Put( aSize );
 }
 
 void SwFlyFrmAttrMgr::SetSize( const Size& rSize )
 {
-    SwFmtFrmSize aSize( GetFrmSize() );
+    SwFormatFrmSize aSize( GetFrmSize() );
     aSize.SetSize(Size(std::max(rSize.Width(), long(MINFLY)), std::max(rSize.Height(), long(MINFLY))));
     m_aSet.Put( aSize );
 }