sw: rename some more global variables

Change-Id: I6f4d0bb57c5d82984ff29b621dc4570f453be31d

4 files changed, 29 insertions, 29 deletions

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index d4af1593e468..aaa21b335598 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -39,9 +39,9 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <DocumentLayoutManager.hxx>
 
-SwLayVout     *SwRootFrm::mpVout = nullptr;
-bool           SwRootFrm::mbInPaint = false;
-bool           SwRootFrm::mbNoVirDev = false;
+SwLayVout     *SwRootFrm::s_pVout = nullptr;
+bool           SwRootFrm::s_isInPaint = false;
+bool           SwRootFrm::s_isNoVirDev = false;
 
 SwCache *SwFrm::mpCache = nullptr;
 
@@ -343,7 +343,7 @@ sal_uInt32 SwFrm::mnLastFrmId=0;
 
 void _FrmInit()
 {
-    SwRootFrm::mpVout = new SwLayVout();
+    SwRootFrm::s_pVout = new SwLayVout();
     SwCache *pNew = new SwCache( 100
 #ifdef DBG_UTIL
     , "static SwBorderAttrs::pCache"
@@ -363,7 +363,7 @@ void _FrmFinit()
             OSL_ENSURE( !pObj, "Who didn't deregister?");
         }
 #endif
-    delete SwRootFrm::mpVout;
+    delete SwRootFrm::s_pVout;
     delete SwFrm::GetCachePtr();
 }
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 15a04afdfb02..359c135760db 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3187,14 +3187,14 @@ void SwRootFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, S
         {
             return;
         }
-        if ( SwRootFrm::mbInPaint )
+        if (SwRootFrm::s_isInPaint)
         {
             SwPaintQueue::Add( pSh, rRect );
             return;
         }
     }
     else
-        SwRootFrm::mbInPaint = bResetRootPaint = true;
+        SwRootFrm::s_isInPaint = bResetRootPaint = true;
 
     SwSavePaintStatics *pStatics = nullptr;
     if ( gProp.pSGlobalShell )
@@ -3344,7 +3344,7 @@ void SwRootFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, S
                     // 2nd parameter is no longer <const> and will be set to the
                     // rectangle the virtual output device is calculated from <aPaintRect>,
                     // if the virtual output is used.
-                    mpVout->Enter( pSh, aPaintRect, !mbNoVirDev );
+                    s_pVout->Enter(pSh, aPaintRect, !s_isNoVirDev);
 
                     // OD 27.09.2002 #103636# - adjust paint rectangle to pixel size
                     // Thus, all objects overlapping on pixel level with the unadjusted
@@ -3353,7 +3353,7 @@ void SwRootFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, S
                 }
 
                 // maybe this can be put in the above scope. Since we are not sure, just leave it ATM
-                mpVout->SetOrgRect( aPaintRect );
+                s_pVout->SetOrgRect( aPaintRect );
 
                 // OD 29.08.2002 #102450#
                 // determine background color of page for <PaintLayer> method
@@ -3425,7 +3425,7 @@ void SwRootFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, S
                     pPage->RefreshExtraData( aPaintRect );
 
                 DELETEZ(gProp.pBLines);
-                mpVout->Leave();
+                s_pVout->Leave();
 
                 // #i68597#
                 // needed to move grid painting inside Begin/EndDrawLayer bounds and to change
@@ -3514,7 +3514,7 @@ void SwRootFrm::Paint(vcl::RenderContext& rRenderContext, SwRect const& rRect, S
     DELETEZ( gProp.pSLines );
 
     if ( bResetRootPaint )
-        SwRootFrm::mbInPaint = false;
+        SwRootFrm::s_isInPaint = false;
     if ( pStatics )
         delete pStatics;
     else
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 06cc87d79f9e..495dab2e64f9 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -122,12 +122,12 @@ SwTabFrm::SwTabFrm( SwTabFrm &rTab )
     rTab.SetFollow( this );
 }
 
-extern const SwTable   *pColumnCacheLastTable;
-extern const SwTabFrm  *pColumnCacheLastTabFrm;
-extern const SwFrm     *pColumnCacheLastCellFrm;
-extern const SwTable   *pRowCacheLastTable;
-extern const SwTabFrm  *pRowCacheLastTabFrm;
-extern const SwFrm     *pRowCacheLastCellFrm;
+extern const SwTable   *g_pColumnCacheLastTable;
+extern const SwTabFrm  *g_pColumnCacheLastTabFrm;
+extern const SwFrm     *g_pColumnCacheLastCellFrm;
+extern const SwTable   *g_pRowCacheLastTable;
+extern const SwTabFrm  *g_pRowCacheLastTabFrm;
+extern const SwFrm     *g_pRowCacheLastCellFrm;
 
 //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for
 SwTabFrm* SwTabFrm::GetFollowFlowLineFor()
@@ -155,14 +155,14 @@ void SwTabFrm::DestroyImpl()
     // makes use of these global pointers. Obviously
     // this code did not consider that a TabFrm can be
     // deleted.
-    if ( this == pColumnCacheLastTabFrm )
-    {
-        pColumnCacheLastTable  = nullptr;
-        pColumnCacheLastTabFrm = nullptr;
-        pColumnCacheLastCellFrm= nullptr;
-        pRowCacheLastTable  = nullptr;
-        pRowCacheLastTabFrm = nullptr;
-        pRowCacheLastCellFrm= nullptr;
+    if (this == g_pColumnCacheLastTabFrm)
+    {
+        g_pColumnCacheLastTable  = nullptr;
+        g_pColumnCacheLastTabFrm = nullptr;
+        g_pColumnCacheLastCellFrm = nullptr;
+        g_pRowCacheLastTable  = nullptr;
+        g_pRowCacheLastTabFrm = nullptr;
+        g_pRowCacheLastCellFrm = nullptr;
     }
 
     SwLayoutFrm::DestroyImpl();
diff --git a/sw/source/core/layout/virtoutp.cxx b/sw/source/core/layout/virtoutp.cxx
index 28b2d6f00dfe..36beac8d2e3c 100644
--- a/sw/source/core/layout/virtoutp.cxx
+++ b/sw/source/core/layout/virtoutp.cxx
@@ -54,9 +54,9 @@ inline DbgRect::DbgRect( OutputDevice *pOutDev, const Rectangle &rRect,
 
 bool SwRootFrm::FlushVout()
 {
-    if( SwRootFrm::mpVout->IsFlushable() )
+    if (SwRootFrm::s_pVout->IsFlushable())
     {
-        SwRootFrm::mpVout->_Flush();
+        SwRootFrm::s_pVout->_Flush();
         return true;
     }
     return false;
@@ -64,8 +64,8 @@ bool SwRootFrm::FlushVout()
 
 bool SwRootFrm::HasSameRect( const SwRect& rRect )
 {
-    if( SwRootFrm::mpVout->IsFlushable() )
-        return ( rRect == SwRootFrm::mpVout->GetOrgRect() );
+    if (SwRootFrm::s_pVout->IsFlushable())
+        return ( rRect == SwRootFrm::s_pVout->GetOrgRect() );
     return false;
 }