sw: prefix members of SwViewShellImp

Change-Id: I36fb0314f8d946b3aeb9fcf6d4cdc711ca79a84e

sw/source/core/inc/viewimp.hxx

@@ -61,33 +61,33 @@ class SwViewShellImp
     // for paint of page preview
     friend class SwPagePreviewLayout;
 
-    SwViewShell *pSh;           // If someone passes an Imp, but needs a SwViewShell, we
+    SwViewShell *m_pShell;           // If someone passes an Imp, but needs a SwViewShell, we
                                 // keep a backlink here
 
-    SwDrawView  *pDrawView;     // Our DrawView
-    SdrPageView *pSdrPageView;  // Exactly one Page for our DrawView
+    SwDrawView  *m_pDrawView;     // Our DrawView
+    SdrPageView *m_pSdrPageView;  // Exactly one Page for our DrawView
 
-    SwPageFrm     *pFirstVisPage; // Always points to the first visible Page
-    SwRegionRects *pRegion;       // Collector of Paintrects from the LayAction
+    SwPageFrm     *m_pFirstVisiblePage; // Always points to the first visible Page
+    SwRegionRects *m_pRegion;       // Collector of Paintrects from the LayAction
 
-    SwLayAction   *pLayAct;      // Is set if an Action object exists
+    SwLayAction   *m_pLayAction;      // Is set if an Action object exists
                                  // Is registered by the SwLayAction ctor and deregistered by the dtor
-    SwLayIdle     *pIdleAct;     // The same as SwLayAction for SwLayIdle
+    SwLayIdle     *m_pIdleAct;     // The same as SwLayAction for SwLayIdle
 
-    SwAccessibleMap *pAccMap;    // Accessible wrappers
+    SwAccessibleMap *m_pAccessibleMap;    // Accessible wrappers
 
-    mutable const SdrObject * pSdrObjCached;
-    mutable OUString sSdrObjCachedComment;
+    mutable const SdrObject * m_pSdrObjectCached;
+    mutable OUString m_sSdrObjectCachedComment;
 
-    bool bFirstPageInvalid : 1; // Pointer to the first Page invalid?
-    bool bResetHdlHiddenPaint : 1; // Ditto
-    bool bSmoothUpdate : 1; // For SmoothScroll
-    bool bStopSmooth : 1;
+    bool m_bFirstPageInvalid : 1; // Pointer to the first Page invalid?
+    bool m_bResetHdlHiddenPaint : 1; // Ditto
+    bool m_bSmoothUpdate : 1; // For SmoothScroll
+    bool m_bStopSmooth : 1;
 
-    sal_uInt16 nRestoreActions  ; // Count for the Action that need to be restored (UNO)
-    SwRect aSmoothRect;
+    sal_uInt16 m_nRestoreActions  ; // Count for the Action that need to be restored (UNO)
+    SwRect m_aSmoothRect;
 
-    SwPagePreviewLayout* mpPgPreviewLayout;
+    SwPagePreviewLayout* m_pPagePreviewLayout;
 
     void SetFirstVisPage(OutputDevice* pRenderContext); // Recalculate the first visible Page
 
@@ -140,26 +140,26 @@ public:
     ~SwViewShellImp();
     void Init( const SwViewOption * ); /// Only for SwViewShell::Init()
 
-    const SwViewShell *GetShell() const { return pSh; }
-          SwViewShell *GetShell()       { return pSh; }
+    const SwViewShell *GetShell() const { return m_pShell; }
+          SwViewShell *GetShell()       { return m_pShell; }
 
     Color GetRetoucheColor() const;
 
     /// Management of the first visible Page
     const SwPageFrm *GetFirstVisPage(OutputDevice* pRenderContext) const;
           SwPageFrm *GetFirstVisPage(OutputDevice* pRenderContext);
-    void SetFirstVisPageInvalid() { bFirstPageInvalid = true; }
+    void SetFirstVisPageInvalid() { m_bFirstPageInvalid = true; }
 
     bool AddPaintRect( const SwRect &rRect );
-    SwRegionRects *GetRegion()      { return pRegion; }
+    SwRegionRects *GetRegion()      { return m_pRegion; }
     void DelRegion();
 
     /// New Interface for StarView Drawing
-    bool  HasDrawView()             const { return 0 != pDrawView; }
-          SwDrawView* GetDrawView()       { return pDrawView; }
-    const SwDrawView* GetDrawView() const { return pDrawView; }
-          SdrPageView*GetPageView()       { return pSdrPageView; }
-    const SdrPageView*GetPageView() const { return pSdrPageView; }
+    bool  HasDrawView()             const { return 0 != m_pDrawView; }
+          SwDrawView* GetDrawView()       { return m_pDrawView; }
+    const SwDrawView* GetDrawView() const { return m_pDrawView; }
+          SdrPageView*GetPageView()       { return m_pSdrPageView; }
+    const SdrPageView*GetPageView() const { return m_pSdrPageView; }
     void MakeDrawView();
 
     /**
@@ -187,10 +187,10 @@ public:
     void NotifySizeChg( const Size &rNewSz );
 
     /// SS for the Lay-/IdleAction and relatives
-    bool  IsAction() const                   { return pLayAct  != 0; }
-    bool  IsIdleAction() const               { return pIdleAct != 0; }
-          SwLayAction &GetLayAction()        { return *pLayAct; }
-    const SwLayAction &GetLayAction() const  { return *pLayAct; }
+    bool  IsAction() const                   { return m_pLayAction  != 0; }
+    bool  IsIdleAction() const               { return m_pIdleAct != 0; }
+          SwLayAction &GetLayAction()        { return *m_pLayAction; }
+    const SwLayAction &GetLayAction() const  { return *m_pLayAction; }
 
     /**
      * If an Action is running we ask it to check whether it's time
@@ -208,18 +208,18 @@ public:
      */
     bool IsUpdateExpFields();
 
-    void    SetRestoreActions(sal_uInt16 nSet){nRestoreActions = nSet;}
-    sal_uInt16  GetRestoreActions() const{return nRestoreActions;}
+    void    SetRestoreActions(sal_uInt16 nSet){m_nRestoreActions = nSet;}
+    sal_uInt16  GetRestoreActions() const{return m_nRestoreActions;}
 
     void InitPagePreviewLayout();
 
     inline SwPagePreviewLayout* PagePreviewLayout()
     {
-        return mpPgPreviewLayout;
+        return m_pPagePreviewLayout;
     }
 
     /// Is this view accessible?
-    bool IsAccessible() const { return pAccMap != 0; }
+    bool IsAccessible() const { return m_pAccessibleMap != 0; }
 
     inline SwAccessibleMap& GetAccessibleMap();
 
@@ -272,10 +272,10 @@ public:
 
 inline SwAccessibleMap& SwViewShellImp::GetAccessibleMap()
 {
-    if( !pAccMap )
+    if( !m_pAccessibleMap )
         CreateAccessibleMap();
 
-    return *pAccMap;
+    return *m_pAccessibleMap;
 }
 
 inline void SwViewShellImp::DisposeAccessibleFrm( const SwFrm *pFrm,

sw/source/core/layout/layact.cxx

@@ -276,14 +276,14 @@ SwLayAction::SwLayAction( SwRootFrm *pRt, SwViewShellImp *pI ) :
     // OD 14.04.2003 #106346# - init new flag <mbFormatContentOnInterrupt>.
     mbFormatContentOnInterrupt = false;
 
-    assert(!pImp->pLayAct); // there can be only one SwLayAction
-    pImp->pLayAct = this;   // register there
+    assert(!pImp->m_pLayAction); // there can be only one SwLayAction
+    pImp->m_pLayAction = this;   // register there
 }
 
 SwLayAction::~SwLayAction()
 {
     OSL_ENSURE( !pWait, "Wait object not destroyed" );
-    pImp->pLayAct = 0;      // unregister
+    pImp->m_pLayAction = 0;      // unregister
 }
 
 void SwLayAction::Reset()
@@ -2118,7 +2118,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) :
 {
     SAL_INFO("sw.idle", "SwLayIdle() entry");
 
-    pImp->pIdleAct = this;
+    pImp->m_pIdleAct = this;
 
     SHOW_IDLE( COL_LIGHTRED );
 
@@ -2306,7 +2306,7 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewShellImp *pI ) :
 
 SwLayIdle::~SwLayIdle()
 {
-    pImp->pIdleAct = 0;
+    pImp->m_pIdleAct = 0;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/core/view/pagepreviewlayout.cxx

@@ -1048,8 +1048,8 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const Rectan
     // prepare paint
     if ( maPreviewPages.size() > 0 )
     {
-        mrParentViewShell.Imp()->bFirstPageInvalid = false;
-        mrParentViewShell.Imp()->pFirstVisPage =
+        mrParentViewShell.Imp()->m_bFirstPageInvalid = false;
+        mrParentViewShell.Imp()->m_pFirstVisiblePage =
                 const_cast<SwPageFrm*>(maPreviewPages[0]->pPage);
     }
 
@@ -1197,8 +1197,8 @@ void SwPagePreviewLayout::Repaint( const Rectangle& rInvalidCoreRect ) const
     // prepare paint
     if ( maPreviewPages.size() > 0 )
     {
-        mrParentViewShell.Imp()->bFirstPageInvalid = false;
-        mrParentViewShell.Imp()->pFirstVisPage =
+        mrParentViewShell.Imp()->m_bFirstPageInvalid = false;
+        mrParentViewShell.Imp()->m_pFirstVisiblePage =
                 const_cast<SwPageFrm*>(maPreviewPages[0]->pPage);
     }
 

sw/source/core/view/vdraw.cxx

@@ -48,8 +48,8 @@ void SwViewShellImp::StartAction()
     if ( HasDrawView() )
     {
         SET_CURR_SHELL( GetShell() );
-        if ( pSh->ISA(SwFEShell) )
-            static_cast<SwFEShell*>(pSh)->HideChainMarker(); // might have changed
+        if ( m_pShell->ISA(SwFEShell) )
+            static_cast<SwFEShell*>(m_pShell)->HideChainMarker(); // might have changed
     }
 }
 
@@ -58,8 +58,8 @@ void SwViewShellImp::EndAction()
     if ( HasDrawView() )
     {
         SET_CURR_SHELL( GetShell() );
-        if ( pSh->ISA(SwFEShell) )
-            static_cast<SwFEShell*>(pSh)->SetChainMarker(); // might have changed
+        if ( m_pShell->ISA(SwFEShell) )
+            static_cast<SwFEShell*>(m_pShell)->SetChainMarker(); // might have changed
     }
 }
 
@@ -67,18 +67,18 @@ void SwViewShellImp::LockPaint()
 {
     if ( HasDrawView() )
     {
-        bResetHdlHiddenPaint = !GetDrawView()->areMarkHandlesHidden();
+        m_bResetHdlHiddenPaint = !GetDrawView()->areMarkHandlesHidden();
         GetDrawView()->hideMarkHandles();
     }
     else
     {
-        bResetHdlHiddenPaint = false;
+        m_bResetHdlHiddenPaint = false;
     }
 }
 
 void SwViewShellImp::UnlockPaint()
 {
-    if ( bResetHdlHiddenPaint )
+    if ( m_bResetHdlHiddenPaint )
         GetDrawView()->showMarkHandles();
 }
 
@@ -204,8 +204,8 @@ void SwViewShellImp::NotifySizeChg( const Size &rNewSz )
     if ( !bCheckDrawObjs )
         return;
 
-    OSL_ENSURE( pSh->getIDocumentDrawModelAccess().GetDrawModel(), "NotifySizeChg without DrawModel" );
-    SdrPage* pPage = pSh->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 );
+    OSL_ENSURE( m_pShell->getIDocumentDrawModelAccess().GetDrawModel(), "NotifySizeChg without DrawModel" );
+    SdrPage* pPage = m_pShell->getIDocumentDrawModelAccess().GetDrawModel()->GetPage( 0 );
     const size_t nObjs = pPage->GetObjCount();
     for( size_t nObj = 0; nObj < nObjs; ++nObj )
     {

sw/source/core/view/viewsh.cxx

@@ -331,7 +331,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
             {
                 SwRootFrm* pCurrentLayout = GetLayout();
 
-                Imp()->pRegion = NULL;
+                Imp()->m_pRegion = NULL;
 
                 //First Invert then Compress, never the other way round!
                 pRegion->Invert();
@@ -1237,7 +1237,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
 
     if(bSmoothScrollAllowed)
     {
-        Imp()->bStopSmooth = false;
+        Imp()->m_bStopSmooth = false;
 
         const SwRect aOldVis( VisArea() );
 
@@ -1333,7 +1333,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
             while ( lDiff )
             {
                 long lScroll;
-                if ( Imp()->bStopSmooth || std::abs(lDiff) <= std::abs(lMaDelta) )
+                if ( Imp()->m_bStopSmooth || std::abs(lDiff) <= std::abs(lMaDelta) )
                 {
                     lScroll = lDiff;
                     lDiff = 0;
@@ -1367,28 +1367,28 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
                     Imp()->GetDrawView()->VisAreaChanged( GetWin() );
 
                 SetFirstVisPageInvalid();
-                if ( !Imp()->bStopSmooth )
+                if ( !Imp()->m_bStopSmooth )
                 {
                     const bool bScrollDirectionIsUp(lScroll > 0);
-                    Imp()->aSmoothRect = VisArea();
+                    Imp()->m_aSmoothRect = VisArea();
 
                     if(bScrollDirectionIsUp)
                     {
-                        Imp()->aSmoothRect.Bottom( VisArea().Top() + lScroll + aPixSz.Height());
+                        Imp()->m_aSmoothRect.Bottom( VisArea().Top() + lScroll + aPixSz.Height());
                     }
                     else
                     {
-                        Imp()->aSmoothRect.Top( VisArea().Bottom() + lScroll - aPixSz.Height());
+                        Imp()->m_aSmoothRect.Top( VisArea().Bottom() + lScroll - aPixSz.Height());
                     }
 
-                    Imp()->bSmoothUpdate = true;
+                    Imp()->m_bSmoothUpdate = true;
                     GetWin()->Update();
-                    Imp()->bSmoothUpdate = false;
+                    Imp()->m_bSmoothUpdate = false;
 
-                    if(!Imp()->bStopSmooth)
+                    if(!Imp()->m_bStopSmooth)
                     {
                             // start paint on logic base
-                            const Rectangle aTargetLogic(Imp()->aSmoothRect.SVRect());
+                            const Rectangle aTargetLogic(Imp()->m_aSmoothRect.SVRect());
                             DLPrePaint2(vcl::Region(aTargetLogic));
 
                             // get target rectangle in discrete pixels
@@ -1422,7 +1422,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect
             }
             pVout.disposeAndClear();
             GetWin()->Update();
-            if ( !Imp()->bStopSmooth )
+            if ( !Imp()->m_bStopSmooth )
                 --mnLockPaint;
             SetFirstVisPageInvalid();
             return true;
@@ -1720,14 +1720,14 @@ void SwViewShell::Paint(vcl::RenderContext& rRenderContext, const Rectangle &rRe
     RenderContextGuard aGuard(mpOut, &rRenderContext, this);
     if ( mnLockPaint )
     {
-        if ( Imp()->bSmoothUpdate )
+        if ( Imp()->m_bSmoothUpdate )
         {
             SwRect aTmp( rRect );
-            if ( !Imp()->aSmoothRect.IsInside( aTmp ) )
-                Imp()->bStopSmooth = true;
+            if ( !Imp()->m_aSmoothRect.IsInside( aTmp ) )
+                Imp()->m_bStopSmooth = true;
             else
             {
-                Imp()->aSmoothRect = aTmp;
+                Imp()->m_aSmoothRect = aTmp;
                 return;
             }
         }