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

4 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 2df5ba1199ba..a4a00367082d 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -65,7 +65,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog(vcl::Window *pParent, SwWrtShell &r
         m_pListItemsLB->SelectEntry(pDropField->GetSelectedItem());
     }
 
-    bool bEnable = !rSh.IsCrsrReadonly();
+    bool bEnable = !rSh.IsCursorReadonly();
     m_pOKPB->Enable( bEnable );
 
     m_pListItemsLB->GrabFocus();
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index c339618a5ef2..23c26b837c80 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -51,7 +51,7 @@
 
 void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
 {
-    if (pSh->CrsrInsideInputField())
+    if (pSh->CursorInsideInputField())
     {
         // move cursor to start of Input Field
         SwInputField* pInputField = dynamic_cast<SwInputField*>(pCurField);
@@ -65,8 +65,8 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
        Normalize PaM instead of swapping. */
     if (!pSh->HasSelection())
     {
-        SwShellCrsr* pCrsr = pSh->getShellCrsr(true);
-        SwPosition aOrigPos(*pCrsr->GetPoint());
+        SwShellCursor* pCursor = pSh->getShellCursor(true);
+        SwPosition aOrigPos(*pCursor->GetPoint());
 
         //After this attempt it is possible that rMgr.GetCurField() != pCurField if
         //the field was in e.g. a zero height portion and so invisible in which
@@ -78,8 +78,8 @@ void SwFieldEditDlg::EnsureSelection(SwField *pCurField, SwFieldMgr &rMgr)
         bool bSelectionFailed = pCurField != pRealCurField;
         if (bSelectionFailed)
         {
-            pCrsr->DeleteMark();
-            *pCrsr->GetPoint() = aOrigPos;
+            pCursor->DeleteMark();
+            *pCursor->GetPoint() = aOrigPos;
         }
     }
 
@@ -137,7 +137,7 @@ void SwFieldEditDlg::Init()
 
         // Traveling only when more than one field
         pSh->StartAction();
-        pSh->CreateCrsr();
+        pSh->CreateCursor();
 
         bool bMove = rMgr.GoNext();
         if( bMove )
@@ -151,7 +151,7 @@ void SwFieldEditDlg::Init()
         if (pCurField->GetTypeId() == TYP_EXTUSERFLD)
             m_pAddressBT->Show();
 
-        pSh->DestroyCrsr();
+        pSh->DestroyCursor();
         pSh->EndAction();
     }
 
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 171bfec91edb..5052e3d0303b 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -97,7 +97,7 @@ SwFieldInputDlg::SwFieldInputDlg( vcl::Window *pParent, SwWrtShell &rS,
 
     // JP 31.3.00: Inputfields in readonly regions must be allowed to
     //              input any content. - 74639
-    bool bEnable = !rSh.IsCrsrReadonly();
+    bool bEnable = !rSh.IsCursorReadonly();
 
     m_pOKBT->Enable( bEnable );
     m_pEditED->SetReadOnly( !bEnable );
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index de2b334556ac..02e965df8511 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -151,7 +151,7 @@ void SwJavaEditDialog::CheckTravel()
     {
         // Traveling only when more than one field
         pSh->StartAction();
-        pSh->CreateCrsr();
+        pSh->CreateCursor();
 
         bNext = pMgr->GoNext();
         if( bNext )
@@ -161,7 +161,7 @@ void SwJavaEditDialog::CheckTravel()
             pMgr->GoNext();
         bTravel |= bNext || bPrev;
 
-        pSh->DestroyCrsr();
+        pSh->DestroyCursor();
         pSh->EndAction();
 
         if (pField->IsCodeURL())