bin/rename-sw-abbreviations.shlibreoffice-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/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 94f142c83ff3..bbd4872541be 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -32,13 +32,13 @@ class SwAttrPool;
 class SwFormatAutoFormat;
 class SwChapterField;
 class SwChapterFieldType;
-class SwContentFrm;
+class SwContentFrame;
 class SwContentNode;
 class SwDoc;
 class SwForm;
 struct SwFormToken;
 class SwPageDesc;
-class SwRootFrm;
+class SwRootFrame;
 class SwTextAttr;
 class SwTextNode;
 struct SwTOXSortTabBase;
@@ -138,7 +138,7 @@ private:
     /** Generate the text for a chapter token.
      */
     OUString
-    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+    GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrame* contentFrame,
             const SwContentNode *contentNode) const;
 
     /** Obtain a ChapterField to use for the text generation.
@@ -147,7 +147,7 @@ private:
      */
     virtual SwChapterField
     ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
-            const SwContentFrm* contentFrame, const SwContentNode *contentNode) const;
+            const SwContentFrame* contentFrame, const SwContentNode *contentNode) const;
 
     friend class ::ToxTextGeneratorTest;
 };