sw: prefix members of SwFEShell

Change-Id: I785df37d61762a4df2b6af18435f668df873625d

4 files changed, 29 insertions, 24 deletions

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 13587c691a16..dca10c7a9582 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -181,8 +181,9 @@ class SdrDropMarkerOverlay;
 
 class SW_DLLPUBLIC SwFEShell : public SwEditShell
 {
-    SdrDropMarkerOverlay *pChainFrom, *pChainTo;
-    bool bCheckForOLEInCaption;
+private:
+    SdrDropMarkerOverlay *m_pChainFrom, *m_pChainTo;
+    bool m_bCheckForOLEInCaption;
 
     SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
     SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&  ) const;
@@ -422,8 +423,8 @@ public:
     void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
 
     /// Check resize of OLE-Object.
-    bool IsCheckForOLEInCaption() const         { return bCheckForOLEInCaption; }
-    void SetCheckForOLEInCaption( bool bFlag )  { bCheckForOLEInCaption = bFlag; }
+    bool IsCheckForOLEInCaption() const         { return m_bCheckForOLEInCaption; }
+    void SetCheckForOLEInCaption( bool bFlag )  { m_bCheckForOLEInCaption = bFlag; }
 
     /// Set name at selected FlyFrame.
     void SetFlyName( const OUString& rName );
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index 80fd4d1487a0..1963d150afc8 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1294,7 +1294,7 @@ Size SwFEShell::RequestObjectResize( const SwRect &rRect, const uno::Reference <
         const SwTxtNode* pTNd;
         const SwpHints* pHts;
         const SwFmtFrmSize& rFrmSz = pFly->GetFmt()->GetFrmSize();
-        if( bCheckForOLEInCaption &&
+        if (m_bCheckForOLEInCaption &&
             0 != rFrmSz.GetWidthPercent() &&
             0 != (pAnchor = pFly->GetAnchorFrm()) &&
             pAnchor->IsTxtFrm() &&
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9311cc9b3a3a..9893d0f11a07 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -607,7 +607,7 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
     SdrView *pView = Imp()->GetDrawView();
     if ( pView && pView->AreObjectsMarked() )
     {
-        delete pChainFrom; delete pChainTo; pChainFrom = pChainTo = 0;
+        delete m_pChainFrom; delete m_pChainTo; m_pChainFrom = m_pChainTo = nullptr;
         SdrHdl* pHdl = pView->PickHandle( *pPt );
         if (pView->BegDragObj( *pPt, 0, pHdl ))
             pView->GetDragMethod()->SetShiftPressed( bIsShift );
@@ -2568,15 +2568,15 @@ void SwFEShell::Unchain( SwFrmFmt &rFmt )
 
 void SwFEShell::HideChainMarker()
 {
-    if ( pChainFrom )
+    if (m_pChainFrom)
     {
-        delete pChainFrom;
-        pChainFrom = 0L;
+        delete m_pChainFrom;
+        m_pChainFrom = nullptr;
     }
-    if ( pChainTo )
+    if (m_pChainTo)
     {
-        delete pChainTo;
-        pChainTo = 0L;
+        delete m_pChainTo;
+        m_pChainTo = nullptr;
     }
 }
 
@@ -2596,9 +2596,9 @@ void SwFEShell::SetChainMarker()
             Point aStart( pPre->Frm().Right(), pPre->Frm().Bottom());
             Point aEnd(pFly->Frm().Pos());
 
-            if ( !pChainFrom )
+            if (!m_pChainFrom)
             {
-                pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+                m_pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
             }
         }
         if ( pFly->GetNextLink() )
@@ -2609,21 +2609,21 @@ void SwFEShell::SetChainMarker()
             Point aStart( pFly->Frm().Right(), pFly->Frm().Bottom());
             Point aEnd(pNxt->Frm().Pos());
 
-            if ( !pChainTo )
+            if (!m_pChainTo)
             {
-                pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+                m_pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
             }
         }
     }
 
     if ( bDelFrom )
     {
-        delete pChainFrom, pChainFrom = 0;
+        delete m_pChainFrom, m_pChainFrom = nullptr;
     }
 
     if ( bDelTo )
     {
-        delete pChainTo,   pChainTo = 0;
+        delete m_pChainTo, m_pChainTo = nullptr;
     }
 }
 
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index a61854f66400..8cfc54c39a0b 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -607,21 +607,25 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
 }
 
 SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions )
-    : SwEditShell( rDoc, pWindow, pOptions ),
-    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
+    : SwEditShell( rDoc, pWindow, pOptions )
+    , m_pChainFrom(nullptr)
+    , m_pChainTo(nullptr)
+    , m_bCheckForOLEInCaption(false)
 {
 }
 
 SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow )
-    : SwEditShell( rShell, pWindow ),
-    pChainFrom( 0 ), pChainTo( 0 ), bCheckForOLEInCaption( false )
+    : SwEditShell( rShell, pWindow )
+    , m_pChainFrom(nullptr)
+    , m_pChainTo(nullptr)
+    , m_bCheckForOLEInCaption(false)
 {
 }
 
 SwFEShell::~SwFEShell()
 {
-    delete pChainFrom;
-    delete pChainTo;
+    delete m_pChainFrom;
+    delete m_pChainTo;
 }
 
 // #i17567# - adjustments for allowing