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

diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index dad1fe298a39..9bf76c1ede5e 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -23,8 +23,8 @@
 
 class OutputDevice;
 class SwViewShellImp;
-class SwFrm;
-class SwFlyFrm;
+class SwFrame;
+class SwFlyFrame;
 class SwAnchoredObject;
 class SdrUndoManager;
 
@@ -33,7 +33,7 @@ class SwDrawView : public FmFormView
     Point           aAnchorPoint;       // anchor position
     SwViewShellImp      &rImp;               // a view is always part of a shell
 
-    const SwFrm *CalcAnchor();
+    const SwFrame *CalcAnchor();
 
     /** determine maximal order number for a 'child' object of given 'parent' object
 
@@ -50,7 +50,7 @@ class SwDrawView : public FmFormView
         optional input parameter - 'child' object, which will not be considered
         on the calculation of the maximal order number
     */
-    static sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrm& _rParentObj,
+    static sal_uInt32 _GetMaxChildOrdNum( const SwFlyFrame& _rParentObj,
                                    const SdrObject* _pExclChildObj = nullptr );
 
     /** method to move 'repeated' objects of the given moved object to the