bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point

renames the most annoying abbreviations in Writer (and partially
in the shared code too).

Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9

1 files changed, 5 insertions, 5 deletions

diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 8da7be7bd1bb..3a09b6c91b2b 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -22,7 +22,7 @@
 #include <sfx2/lnkbase.hxx>
 
 class SwNode;
-class SwCntntNode;
+class SwContentNode;
 class ReReadThread;
 long GrfNodeChanged( void* pLink, void* pCaller );
 
@@ -30,7 +30,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink
 {
     friend long GrfNodeChanged( void* pLink, void* pCaller );
 
-    SwCntntNode* pCntntNode;
+    SwContentNode* pContentNode;
     bool bSwapIn : 1;
     bool bNoDataFlag : 1;
     bool bIgnoreDataChanged : 1;
@@ -42,8 +42,8 @@ protected:
 public:
     TYPEINFO_OVERRIDE();
 
-    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 )
-        : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
+    SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
+        : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
         bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
         m_pReReadThread(0)
     {}
@@ -56,7 +56,7 @@ public:
 
     virtual const SwNode* GetAnchor() const;
 
-    SwCntntNode *GetCntntNode() { return pCntntNode; }
+    SwContentNode *GetContentNode() { return pContentNode; }
 
     // For graphics only.
     bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );