Kaydet (Commit) 37c21f3c authored tarafından Michael Stahl's avatar Michael Stahl

SwRedlineItr: prefix members

Change-Id: If4e0dde34004766862240c10c41643c2919a6b18
üst 4b049a61
...@@ -64,17 +64,17 @@ public: ...@@ -64,17 +64,17 @@ public:
class SwRedlineItr class SwRedlineItr
{ {
std::deque<SwTextAttr *> m_Hints; std::deque<SwTextAttr *> m_Hints;
const SwDoc& rDoc; const SwDoc& m_rDoc;
SwAttrHandler& rAttrHandler; SwAttrHandler& m_rAttrHandler;
std::unique_ptr<SfxItemSet> pSet; std::unique_ptr<SfxItemSet> m_pSet;
SwExtend *pExt; SwExtend *m_pExt;
sal_uLong nNdIdx; sal_uLong m_nNdIdx;
sal_Int32 nFirst; sal_Int32 m_nFirst;
sal_Int32 nAct; sal_Int32 m_nAct;
sal_Int32 nStart; sal_Int32 m_nStart;
sal_Int32 nEnd; sal_Int32 m_nEnd;
bool bOn; bool m_bOn;
bool bShow; bool m_bShow;
void Clear_( SwFont* pFnt ); void Clear_( SwFont* pFnt );
bool ChkSpecialUnderline_() const; bool ChkSpecialUnderline_() const;
...@@ -82,11 +82,11 @@ class SwRedlineItr ...@@ -82,11 +82,11 @@ class SwRedlineItr
short Seek_( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ); short Seek_( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld );
sal_Int32 GetNextRedln_( sal_Int32 nNext ); sal_Int32 GetNextRedln_( sal_Int32 nNext );
short EnterExtend( SwFont& rFnt, sal_Int32 nNew ) { short EnterExtend( SwFont& rFnt, sal_Int32 nNew ) {
if( pExt ) return pExt->Enter( rFnt, nNew ); if (m_pExt) return m_pExt->Enter( rFnt, nNew );
return 0; return 0;
} }
sal_Int32 NextExtend( sal_Int32 nNext ) { sal_Int32 NextExtend( sal_Int32 nNext ) {
if( pExt ) return pExt->Next( nNext ); if (m_pExt) return m_pExt->Next( nNext );
return nNext; return nNext;
} }
public: public:
...@@ -94,31 +94,34 @@ public: ...@@ -94,31 +94,34 @@ public:
sal_Int32 nRedlPos, bool bShw, const std::vector<ExtTextInputAttr> *pArr = nullptr, sal_Int32 nRedlPos, bool bShw, const std::vector<ExtTextInputAttr> *pArr = nullptr,
sal_Int32 nExtStart = COMPLETE_STRING ); sal_Int32 nExtStart = COMPLETE_STRING );
~SwRedlineItr() COVERITY_NOEXCEPT_FALSE; ~SwRedlineItr() COVERITY_NOEXCEPT_FALSE;
bool IsOn() const { return bOn || ( pExt && pExt->IsOn() ); } bool IsOn() const { return m_bOn || (m_pExt && m_pExt->IsOn()); }
void Clear( SwFont* pFnt ) { if( bOn ) Clear_( pFnt ); } void Clear( SwFont* pFnt ) { if (m_bOn) Clear_( pFnt ); }
void ChangeTextAttr( SwFont* pFnt, SwTextAttr const &rHt, bool bChg ); void ChangeTextAttr( SwFont* pFnt, SwTextAttr const &rHt, bool bChg );
short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) { short Seek( SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld ) {
if( bShow || pExt ) return Seek_( rFnt, nNew, nOld ); if (m_bShow || m_pExt) return Seek_( rFnt, nNew, nOld );
return 0; return 0;
} }
void Reset() { if( nAct != nFirst ) nAct = COMPLETE_STRING; void Reset() {
if( pExt ) pExt->Reset(); } if (m_nAct != m_nFirst) m_nAct = COMPLETE_STRING;
if (m_pExt) m_pExt->Reset();
}
sal_Int32 GetNextRedln( sal_Int32 nNext ) { sal_Int32 GetNextRedln( sal_Int32 nNext ) {
if( bShow || pExt ) return GetNextRedln_( nNext ); if (m_bShow || m_pExt) return GetNextRedln_( nNext );
return nNext; return nNext;
} }
bool ChkSpecialUnderline() const bool ChkSpecialUnderline() const
{ return IsOn() && ChkSpecialUnderline_(); } { return IsOn() && ChkSpecialUnderline_(); }
bool CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd ); bool CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd );
bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew ) bool LeaveExtend( SwFont& rFnt, sal_Int32 nNew )
{ return pExt->Leave(rFnt, nNew ); } { return m_pExt->Leave(rFnt, nNew ); }
bool ExtOn() { bool ExtOn() {
if( pExt ) return pExt->IsOn(); if (m_pExt) return m_pExt->IsOn();
return false; return false;
} }
void UpdateExtFont( SwFont &rFnt ) { void UpdateExtFont( SwFont &rFnt ) {
OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" ); OSL_ENSURE( ExtOn(), "UpdateExtFont without ExtOn" );
pExt->UpdateFont( rFnt ); } m_pExt->UpdateFont( rFnt );
}
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment