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

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

Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8

1 files changed, 3 insertions, 3 deletions

diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 0f1b4a8ec150..fd3928622e09 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -248,7 +248,7 @@ public:
                     sal_uInt16 nCnt = 1, bool bBehind = true );
     void PrepareDelBoxes( const SwSelBoxes& rBoxes );
     bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
-        SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
+        SwUndo* pUndo, const bool bDelMakeFrames, const bool bCorrBorder );
     bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
 
     void FindSuperfluousRows( SwSelBoxes& rBoxes )
@@ -496,13 +496,13 @@ public:
     void RegisterToFormat( SwFormat& rFormat ) ;
 };
 
-class SwCellFrm;
+class SwCellFrame;
 class SW_DLLPUBLIC SwTableCellInfo : public ::boost::noncopyable
 {
     struct Impl;
     ::std::unique_ptr<Impl> m_pImpl;
 
-    const SwCellFrm * getCellFrm() const ;
+    const SwCellFrame * getCellFrame() const ;
 
 public:
     SwTableCellInfo(const SwTable * pTable);