sw: prefix SwTextFrame::pTextCache member

Change-Id: Ibfbc59c9df89a3cde6226bd49cf33c2ac865d4a8

sw/source/core/inc/txtfrm.hxx

@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
     /// if there are too many of them, but the "valid" flags of the frame
     /// will still be set; GetFormatted() is the function that forces
     /// recreation of the SwLineLayout by Format() if necessary.
-    static SwCache *pTextCache;
+    static SwCache *s_pTextCache;
     static long nMinPrtLine;    // This Line must not be underrun when printing
                                 // Hack for table cells stretching multiple pages
 
@@ -451,7 +451,7 @@ public:
     SwTextFrame *FindQuoVadisFrame();
 
     /**
-     * In case the SwLineLayout was cleared out of the pTextCache, recreate it.
+     * In case the SwLineLayout was cleared out of the s_pTextCache, recreate it
      *
      * #i29062# GetFormatted() can trigger a full formatting
      * of the paragraph, causing other layout frames to become invalid. This
@@ -472,8 +472,8 @@ public:
     bool GetDropRect( SwRect &rRect ) const
     { return HasPara() && GetDropRect_( rRect ); }
 
-    static SwCache *GetTextCache() { return pTextCache; }
-    static void     SetTextCache( SwCache *pNew ) { pTextCache = pNew; }
+    static SwCache *GetTextCache() { return s_pTextCache; }
+    static void     SetTextCache( SwCache *pNew ) { s_pTextCache = pNew; }
 
     static long GetMinPrtLine() { return nMinPrtLine; }
 

sw/source/core/text/txtfrm.cxx

@@ -398,7 +398,7 @@ SwTextFrame::SwTextFrame(SwTextNode * const pNode, SwFrame* pSib )
 
 void SwTextFrame::DestroyImpl()
 {
-    // Remove associated SwParaPortion from pTextCache
+    // Remove associated SwParaPortion from s_pTextCache
     ClearPara();
 
     const SwContentNode* pCNd;
@@ -2123,7 +2123,7 @@ SwTextFrame* SwTextFrame::GetFormatted( bool bForceQuickFormat )
     vcl::RenderContext* pRenderContext = getRootFrame()->GetCurrShell()->GetOut();
     SwSwapIfSwapped swap( this );
 
-    // In case the SwLineLayout was cleared out of the pTextCache, recreate it.
+    // In case the SwLineLayout was cleared out of the s_pTextCache, recreate it
     // Not for empty paragraphs
     if( !HasPara() && !(isFrameAreaDefinitionValid() && IsEmpty()) )
     {
@@ -2134,7 +2134,7 @@ SwTextFrame* SwTextFrame::GetFormatted( bool bForceQuickFormat )
         // If the flags were valid (hence bFormat=true), Calc did nothing,
         // so Format() must be called manually in order to recreate
         // the SwLineLayout that has been deleted from the
-        // SwTextFrame::pTextCache (hence !HasPara() above).
+        // SwTextFrame::s_pTextCache (hence !HasPara() above).
         // Optimization with FormatQuick()
         if( bFormat && !FormatQuick( bForceQuickFormat ) )
             Format(getRootFrame()->GetCurrShell()->GetOut());

sw/source/core/text/txtinit.cxx

@@ -38,7 +38,7 @@
 #include <txtfly.hxx>
 #include <dbg_lay.hxx>
 
-SwCache *SwTextFrame::pTextCache = nullptr;
+SwCache *SwTextFrame::s_pTextCache = nullptr;
 long SwTextFrame::nMinPrtLine = 0;
 SwContourCache *pContourCache = nullptr;
 SwDropCapCache *pDropCapCache = nullptr;
@@ -59,7 +59,7 @@ void TextInit_()
     pSwFontCache = new SwFontCache; // Cache for SwTextFormatColl -> SwFontObj = { SwFont aSwFont, SfxPoolItem* pDefaultArray }
     SwCache *pTextCache = new SwCache( 250 // Cache for SwTextFrame -> SwTextLine = { SwParaPortion* pLine }
 #ifdef DBG_UTIL
-    , "static SwTextFrame::pTextCache"
+    , "static SwTextFrame::s_pTextCache"
 #endif
     );
     SwTextFrame::SetTextCache( pTextCache );