diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-30 08:35:03 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-30 08:35:03 +0100 |
commit | e794e43a0cedb9b836f0d1d75ad31413ee74cfea (patch) | |
tree | 6764c32274428b736ebd906f1f06d93137f7528b | |
parent | 1d46941fd140940928bd4376d6cd9b8e928ac261 (diff) |
sw: prefix members of SwForm
Change-Id: I91c1aa5149bff9c6489ad6f1a68818b502d95966
-rw-r--r-- | sw/inc/tox.hxx | 30 | ||||
-rw-r--r-- | sw/source/core/tox/tox.cxx | 52 |
2 files changed, 41 insertions, 41 deletions
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 999c2299198a..145d02538698 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -287,15 +287,15 @@ public: class SW_DLLPUBLIC SwForm { - SwFormTokens aPattern[ AUTH_TYPE_END + 1 ]; // #i21237# - OUString aTemplate[ AUTH_TYPE_END + 1 ]; + SwFormTokens m_aPattern[ AUTH_TYPE_END + 1 ]; // #i21237# + OUString m_aTemplate[ AUTH_TYPE_END + 1 ]; - TOXTypes eType; - sal_uInt16 nFormMaxLevel; + TOXTypes m_eType; + sal_uInt16 m_nFormMaxLevel; - bool bGenerateTabPos : 1; - bool bIsRelTabPos : 1; - bool bCommaSeparated : 1; + bool m_bGenerateTabPos : 1; + bool m_bIsRelTabPos : 1; + bool m_bCommaSeparated : 1; public: SwForm( TOXTypes eTOXType = TOX_CONTENT ); @@ -317,11 +317,11 @@ public: inline TOXTypes GetTOXType() const; inline sal_uInt16 GetFormMax() const; - bool IsRelTabPos() const { return bIsRelTabPos; } - void SetRelTabPos( bool b ) { bIsRelTabPos = b; } + bool IsRelTabPos() const { return m_bIsRelTabPos; } + void SetRelTabPos( bool b ) { m_bIsRelTabPos = b; } - bool IsCommaSeparated() const { return bCommaSeparated;} - void SetCommaSeparated( bool b) { bCommaSeparated = b;} + bool IsCommaSeparated() const { return m_bCommaSeparated;} + void SetCommaSeparated( bool b) { m_bCommaSeparated = b;} static sal_uInt16 GetFormMaxLevel( TOXTypes eType ); @@ -646,23 +646,23 @@ inline OUString SwTOXMark::GetSecondaryKeyReading() const inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); - aTemplate[nLevel] = rTemplate; + m_aTemplate[nLevel] = rTemplate; } inline OUString SwForm::GetTemplate(sal_uInt16 nLevel) const { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); - return aTemplate[nLevel]; + return m_aTemplate[nLevel]; } inline TOXTypes SwForm::GetTOXType() const { - return eType; + return m_eType; } inline sal_uInt16 SwForm::GetFormMax() const { - return nFormMaxLevel; + return m_nFormMaxLevel; } //SwTOXType diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 19d5f1d42db0..ddb94bd6f449 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -215,13 +215,13 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy) // Edit forms SwForm::SwForm( TOXTypes eTyp ) // #i21237# - : eType( eTyp ), nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )), + : m_eType( eTyp ), m_nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )), // nFirstTabPos( lNumIndent ), - bCommaSeparated(false) + m_bCommaSeparated(false) { //bHasFirstTabPos = - bGenerateTabPos = false; - bIsRelTabPos = true; + m_bGenerateTabPos = false; + m_bIsRelTabPos = true; // The table of contents has a certain number of headlines + headings // The user has 10 levels + headings @@ -229,7 +229,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# // Indexes of tables, object illustrations and authorities consist of a heading and one level sal_uInt16 nPoolId; - switch( eType ) + switch( m_eType ) { case TOX_INDEX: nPoolId = STR_POOLCOLL_TOX_IDXH; break; case TOX_USER: nPoolId = STR_POOLCOLL_TOX_USERH; break; @@ -245,14 +245,14 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# } SwFormTokens aTokens; - if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType ) + if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType ) { SwFormToken aLinkStt (TOKEN_LINK_START); aLinkStt.sCharStyleName = SW_RES(STR_POOLCHR_TOXJUMP); aTokens.push_back(aLinkStt); } - if (TOX_CONTENT == eType) + if (TOX_CONTENT == m_eType) { aTokens.push_back(SwFormToken(TOKEN_ENTRY_NO)); aTokens.push_back(SwFormToken(TOKEN_ENTRY_TEXT)); @@ -260,7 +260,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else aTokens.push_back(SwFormToken(TOKEN_ENTRY)); - if (TOX_AUTHORITIES != eType) + if (TOX_AUTHORITIES != m_eType) { SwFormToken aToken(TOKEN_TAB_STOP); aToken.nTabStopPosition = 0; @@ -273,12 +273,12 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS)); } - if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType) + if (TOX_CONTENT == m_eType || TOX_ILLUSTRATIONS == m_eType) aTokens.push_back(SwFormToken(TOKEN_LINK_END)); SetTemplate( 0, SW_RESSTR( nPoolId++ )); - if(TOX_INDEX == eType) + if(TOX_INDEX == m_eType) { for( sal_uInt16 i = 1; i < 5; ++i ) { @@ -301,7 +301,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else for( sal_uInt16 i = 1; i < GetFormMax(); ++i, ++nPoolId ) // Number 0 is the title { - if(TOX_AUTHORITIES == eType) + if(TOX_AUTHORITIES == m_eType) { SwFormTokens aAuthTokens; lcl_FillAuthPattern(aAuthTokens, i); @@ -310,35 +310,35 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237# else SetPattern( i, aTokens ); - if( TOX_CONTENT == eType && 6 == i ) + if( TOX_CONTENT == m_eType && 6 == i ) nPoolId = STR_POOLCOLL_TOX_CNTNT6; - else if( TOX_USER == eType && 6 == i ) + else if( TOX_USER == m_eType && 6 == i ) nPoolId = STR_POOLCOLL_TOX_USER6; - else if( TOX_AUTHORITIES == eType ) + else if( TOX_AUTHORITIES == m_eType ) nPoolId = STR_POOLCOLL_TOX_AUTHORITIES1; SetTemplate( i, SW_RESSTR( nPoolId ) ); } } SwForm::SwForm(const SwForm& rForm) - : eType( rForm.eType ) + : m_eType( rForm.m_eType ) { *this = rForm; } SwForm& SwForm::operator=(const SwForm& rForm) { - eType = rForm.eType; - nFormMaxLevel = rForm.nFormMaxLevel; + m_eType = rForm.m_eType; + m_nFormMaxLevel = rForm.m_nFormMaxLevel; // nFirstTabPos = rForm.nFirstTabPos; // bHasFirstTabPos = rForm.bHasFirstTabPos; - bGenerateTabPos = rForm.bGenerateTabPos; - bIsRelTabPos = rForm.bIsRelTabPos; - bCommaSeparated = rForm.bCommaSeparated; - for(sal_uInt16 i=0; i < nFormMaxLevel; ++i) + m_bGenerateTabPos = rForm.m_bGenerateTabPos; + m_bIsRelTabPos = rForm.m_bIsRelTabPos; + m_bCommaSeparated = rForm.m_bCommaSeparated; + for(sal_uInt16 i=0; i < m_nFormMaxLevel; ++i) { - aPattern[i] = rForm.aPattern[i]; - aTemplate[i] = rForm.aTemplate[i]; + m_aPattern[i] = rForm.m_aPattern[i]; + m_aTemplate[i] = rForm.m_aTemplate[i]; } return *this; } @@ -841,7 +841,7 @@ SwFormTokensHelper::SwFormTokensHelper(const OUString & rPattern) void SwForm::SetPattern(sal_uInt16 nLevel, const SwFormTokens& rTokens) { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); - aPattern[nLevel] = rTokens; + m_aPattern[nLevel] = rTokens; } void SwForm::SetPattern(sal_uInt16 nLevel, const OUString & rStr) @@ -849,13 +849,13 @@ void SwForm::SetPattern(sal_uInt16 nLevel, const OUString & rStr) OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); SwFormTokensHelper aHelper(rStr); - aPattern[nLevel] = aHelper.GetTokens(); + m_aPattern[nLevel] = aHelper.GetTokens(); } const SwFormTokens& SwForm::GetPattern(sal_uInt16 nLevel) const { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); - return aPattern[nLevel]; + return m_aPattern[nLevel]; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |