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

5 files changed, 90 insertions, 90 deletions

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 9e3189f8653a..6080438fcd1d 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -55,7 +55,7 @@ interface BaseText
     SID_ATTR_BRUSH_CHAR // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetTxtCtrlState ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -1180,26 +1180,26 @@ interface BaseText
     ]
     SID_ATTR_PARA_SPLIT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_KEEP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_WIDOWS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_ORPHANS // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_PARA_PAGEBREAK // status(final|play)
@@ -1271,49 +1271,49 @@ interface BaseText
     ]
     SID_ATTR_PARA_HYPHENZONE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
-        ExecMethod = ExecTxtCtrl ;
+        ExecMethod = ExecTextCtrl ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_FONTHEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtFontCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextFontCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_COLOR_BACKGROUND // status()
@@ -1342,68 +1342,68 @@ interface BaseText
     ]
     SID_ATTR_CHAR_COLOR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl ;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl ;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_WEIGHT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CJK_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_CTL_POSTURE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_UNDERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_OVERLINE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_FLASH // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_STRIKEOUT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_UNDERLINE_DOUBLE // status(final|play)
@@ -1414,26 +1414,26 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CONTOUR // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_SHADOWED // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SET_SUPER_SCRIPT
@@ -1450,20 +1450,20 @@ interface BaseText
     ]
     SID_ATTR_CHAR_CASEMAP // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;;
-        StateMethod = GetTxtFontCtrlState;
+        ExecMethod = ExecTextCtrl;;
+        StateMethod = GetTextFontCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_CHAR_DLG // status(final|play)
@@ -1484,8 +1484,8 @@ interface BaseText
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
-        ExecMethod = ExecTxtCtrl;
-        StateMethod = GetTxtCtrlState ;
+        ExecMethod = ExecTextCtrl;
+        StateMethod = GetTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_GROW_FONT_SIZE // status(final|play)
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 53ed9110ef09..4bdcea5e7135 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -159,49 +159,49 @@ interface TextDrawText
     SID_ATTR_CHAR_WEIGHT // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_POSTURE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_UNDERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_OVERLINE // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_CONTOUR
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_SHADOWED
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_STRIKEOUT
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
@@ -473,7 +473,7 @@ interface TextDrawText
     SID_AUTOSPELL_CHECK
     [
         ExecMethod = Execute;
-        StateMethod = GetDrawTxtCtrlState
+        StateMethod = GetDrawTextCtrlState
     ]
 
     SID_SEARCH_DLG
@@ -622,13 +622,13 @@ interface TextDrawText
     FN_GROW_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     FN_SHRINK_FONT_SIZE
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 }
@@ -639,57 +639,57 @@ interface TextDrawFont
     SID_ATTR_CHAR_FONT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_FONTHEIGHT // status()
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
     SID_ATTR_CHAR_COLOR // api:
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_RELIEF
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_LANGUAGE // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_KERNING // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_AUTOKERN // // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
     SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
     [
         ExecMethod = Execute ;
-        StateMethod = GetDrawTxtCtrlState ;
+        StateMethod = GetDrawTextCtrlState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index c00514fbc736..e0dd9ee1b259 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -24,9 +24,9 @@ struct SwLineNumber
     BOOL    CountLines          MID_LINENUMBER_COUNT;
     INT32   StartValue          MID_LINENUMBER_STARTVALUE;
 };
-item SwLineNumber SwFmtLineNumber;
+item SwLineNumber SwFormatLineNumber;
 
-struct INetFmt
+struct INetFormat
 {
     String      URL             MID_URL_URL;
     String      Target          MID_URL_TARGET;
@@ -34,7 +34,7 @@ struct INetFmt
     String      VisitedFormat   MID_URL_VISITED_FMT;
     String      UnvisitedFormat MID_URL_UNVISITED_FMT;
 };
-item INetFmt SwFmtINetFmt;
+item INetFormat SwFormatINetFormat;
 
 struct Drop
 {
@@ -44,7 +44,7 @@ struct Drop
     BOOL    WholeWord   MID_DROPCAP_WHOLE_WORD;
 //    String  Style       MID_DROPCAP_CHAR_STYLE_NAME;
 };
-item Drop SwFmtDrop;
+item Drop SwFormatDrop;
 
 struct Envelope
 {
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c7d9dfdda9e3..76987c789f3b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1846,7 +1846,7 @@ SfxVoidItem FormatColumns FN_FORMAT_COLUMN
     GroupId = GID_FORMAT;
 ]
 
-SwFmtDrop FormatDropcap FN_FORMAT_DROPCAPS
+SwFormatDrop FormatDropcap FN_FORMAT_DROPCAPS
 
 [
     /* flags: */
@@ -8785,7 +8785,7 @@ SfxUInt16Item NumNewStartAt FN_NUMBER_NEWSTART_AT
     GroupId = GID_FORMAT;
 ]
 
-SwFmtLineNumber LineNumber FN_FORMAT_LINENUMBER
+SwFormatLineNumber LineNumber FN_FORMAT_LINENUMBER
 
 [
     /* flags: */
@@ -8887,7 +8887,7 @@ SfxVoidItem JumpToFootnoteArea FN_TO_FOOTNOTE_AREA
     GroupId = GID_NAVIGATOR;
 ]
 
-SwFmtINetFmt HyperlinkAttributes FN_TXTATR_INET
+SwFormatINetFormat HyperlinkAttributes FN_TXTATR_INET
 
 [
     /* flags: */
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index f2f635e6d643..4df069ef3087 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -33,13 +33,13 @@ interface TextTable : BaseTextTable
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 /*
-    SvxFmtSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
+    SvxFormatSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;
         GroupId = GID_TABLE ;
     ]
-    SvxFmtKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
+    SvxFormatKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
     [
         ExecMethod = Execute;
         StateMethod = GetState;