sw: prefix members of SwTxtInfo

Change-Id: Ifd3a4e5f4b84b6f8a74e59a7bcdf8ddc35dfe408

sw/source/core/text/inftxt.cxx

@@ -154,19 +154,19 @@ void SwLineInfo::CtorInitLineInfo( const SwAttrSet& rAttrSet,
 
 void SwTxtInfo::CtorInitTxtInfo( SwTxtFrm *pFrm )
 {
-    pPara = pFrm->GetPara();
-    nTxtStart = pFrm->GetOfst();
-    if( !pPara )
+    m_pPara = pFrm->GetPara();
+    m_nTxtStart = pFrm->GetOfst();
+    if (!m_pPara)
     {
-        OSL_ENSURE( pPara, "+SwTxtInfo::CTOR: missing paragraph information" );
+        SAL_WARN("sw.core", "+SwTxtInfo::CTOR: missing paragraph information");
         pFrm->Format();
-        pPara = pFrm->GetPara();
+        m_pPara = pFrm->GetPara();
     }
 }
 
 SwTxtInfo::SwTxtInfo( const SwTxtInfo &rInf )
-    : pPara( ((SwTxtInfo&)rInf).GetParaPortion() ),
-      nTxtStart( rInf.GetTxtStart() )
+    : m_pPara( const_cast<SwTxtInfo&>(rInf).GetParaPortion() )
+    , m_nTxtStart( rInf.GetTxtStart() )
 { }
 
 #if OSL_DEBUG_LEVEL > 0

sw/source/core/text/inftxt.hxx

@@ -121,21 +121,22 @@ class SwTxtInfo
 {
     // Implementation in txthyph.cxx
     friend void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot );
-    SwParaPortion *pPara;
-    sal_Int32 nTxtStart; // TxtOfst for Follows
+    SwParaPortion *m_pPara;
+    sal_Int32 m_nTxtStart; // TxtOfst for Follows
 
 protected:
     SwTxtInfo()
-        : pPara(0)
-        , nTxtStart(0)
-        {}
+        : m_pPara(0)
+        , m_nTxtStart(0)
+    {}
+
 public:
     void CtorInitTxtInfo( SwTxtFrm *pFrm );
     SwTxtInfo( const SwTxtInfo &rInf );
     SwTxtInfo( SwTxtFrm *pFrm ) { CtorInitTxtInfo( pFrm ); }
-    SwParaPortion *GetParaPortion() { return pPara; }
-    const SwParaPortion *GetParaPortion() const { return pPara; }
-    sal_Int32 GetTxtStart() const { return nTxtStart; }
+    SwParaPortion *GetParaPortion() { return m_pPara; }
+    const SwParaPortion *GetParaPortion() const { return m_pPara; }
+    sal_Int32 GetTxtStart() const { return m_nTxtStart; }
 
     friend SvStream & WriteSwTxtInfo( SvStream &rOS, const SwTxtInfo &rInf );
 };

sw/source/core/text/txthyph.cxx

@@ -119,7 +119,7 @@ bool SwTxtFrm::Hyphenate( SwInterHyphInfo &rHyphInf )
 void SetParaPortion( SwTxtInfo *pInf, SwParaPortion *pRoot )
 {
     OSL_ENSURE( pRoot, "SetParaPortion: no root anymore" );
-    pInf->pPara = pRoot;
+    pInf->m_pPara = pRoot;
 }
 
 bool SwTxtFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )