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

1 files changed, 4 insertions, 4 deletions

diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 2e439c05f2d8..a8b06d0bdf95 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -15,7 +15,7 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
-class SwTxtNode;
+class SwTextNode;
 
 class ToxLinkProcessorTest;
 
@@ -41,7 +41,7 @@ public:
 
     /** Insert the found links as attributes to a text node */
     void
-    InsertLinkAttributes(SwTxtNode& node);
+    InsertLinkAttributes(SwTextNode& node);
 
 private:
     /** Obtain the pool id which belongs to a character style.
@@ -66,9 +66,9 @@ private:
      */
     struct ClosedLink {
         ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 endPosition) :
-                mINetFmt(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
+                mINetFormat(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
         }
-        SwFmtINetFmt mINetFmt;
+        SwFormatINetFormat mINetFormat;
         sal_Int32 mStartTextPos;
         sal_Int32 mEndTextPos;
     };