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

diff --git a/sw/source/uibase/wrtsh/wrtundo.cxx b/sw/source/uibase/wrtsh/wrtundo.cxx
index 1756fdd53b22..d8e7ed8498a0 100644
--- a/sw/source/uibase/wrtsh/wrtundo.cxx
+++ b/sw/source/uibase/wrtsh/wrtundo.cxx
@@ -62,27 +62,27 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
     DoUndo(bSaveDoesUndo);
 
     bool bCreateXSelection = false;
-    const bool bFrmSelected = IsFrmSelected() || IsObjSelected();
+    const bool bFrameSelected = IsFrameSelected() || IsObjSelected();
     if ( IsSelection() )
     {
-        if ( bFrmSelected )
-            UnSelectFrm();
+        if ( bFrameSelected )
+            UnSelectFrame();
 
         // Set the function pointer for canceling the selection at the
         // cursor position.
         m_fnKillSel = &SwWrtShell::ResetSelect;
-        m_fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
+        m_fnSetCursor = &SwWrtShell::SetCursorKillSel;
         bCreateXSelection = true;
     }
-    else if ( bFrmSelected )
+    else if ( bFrameSelected )
     {
-        EnterSelFrmMode();
+        EnterSelFrameMode();
         bCreateXSelection = true;
     }
     else if( (CNT_GRF | CNT_OLE ) & GetCntType() )
     {
         SelectObj( GetCharRect().Pos() );
-        EnterSelFrmMode();
+        EnterSelFrameMode();
         bCreateXSelection = true;
     }