diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-04-21 17:32:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-04-21 20:36:27 +0200 |
commit | 824229a55e5f5bf0e7bd8e2917635175c9c82dc4 (patch) | |
tree | 102807bb400d16e877beb9a630ec29ad326f0e3a | |
parent | 84a6758609fc9472c7cb5a2e449860bcc554ed58 (diff) |
sw: prefix members of SwField
Change-Id: If81d5a2ab499837f9e4a38665b0daf2a6bba1269
-rw-r--r-- | sw/inc/fldbas.hxx | 22 | ||||
-rw-r--r-- | sw/source/core/fields/fldbas.cxx | 48 |
2 files changed, 35 insertions, 35 deletions
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 61cf2b54b20b..8cc63afbf575 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -284,17 +284,17 @@ private: mutable OUString m_Cache; ///< Cached expansion (for clipboard). bool m_bUseFieldValueCache; /// control the usage of the cached field value - sal_uInt16 nLang; ///< Always change via SetLanguage! - bool bIsAutomaticLanguage; - sal_uInt32 nFormat; + sal_uInt16 m_nLang; ///< Always change via SetLanguage! + bool m_bIsAutomaticLanguage; + sal_uInt32 m_nFormat; - SwFieldType* pType; + SwFieldType* m_pType; virtual OUString Expand() const = 0; virtual SwField* Copy() const = 0; protected: - void SetFormat(sal_uInt32 nSet) {nFormat = nSet;} + void SetFormat(sal_uInt32 const nSet) { m_nFormat = nSet; } SwField( SwFieldType* pTyp, sal_uInt32 nFmt = 0, @@ -331,7 +331,7 @@ public: #ifdef DBG_UTIL ; // implemented in fldbas.cxx #else - { return pType->Which(); } + { return m_pType->Which(); } #endif // TYP_ID @@ -361,8 +361,8 @@ public: bool HasClickHdl() const; bool IsFixed() const; - bool IsAutomaticLanguage() const { return bIsAutomaticLanguage;} - void SetAutomaticLanguage(bool bSet){bIsAutomaticLanguage = bSet;} + bool IsAutomaticLanguage() const { return m_bIsAutomaticLanguage;} + void SetAutomaticLanguage(bool const bSet) {m_bIsAutomaticLanguage = bSet;} virtual OUString GetDescription() const; /// Is this field clickable? @@ -370,13 +370,13 @@ public: }; inline SwFieldType* SwField::GetTyp() const - { return pType; } + { return m_pType; } inline sal_uInt32 SwField::GetFormat() const - { return nFormat; } + { return m_nFormat; } inline sal_uInt16 SwField::GetLanguage() const - { return nLang; } + { return m_nLang; } /// Fields containing values that have to be formatted via number formatter. class SwValueFieldType : public SwFieldType diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index beec78f63cd2..a9e6b71930c3 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -187,18 +187,18 @@ void SwFldTypes::dumpAsXml(xmlTextWriterPtr pWriter) const // Base class for all fields. // A field (multiple can exist) references a field type (can exists only once) SwField::SwField( - SwFieldType* pTyp, - sal_uInt32 nFmt, - sal_uInt16 nLng, - bool bUseFieldValueCache ) + SwFieldType* pType, + sal_uInt32 nFormat, + sal_uInt16 nLang, + bool bUseFieldValueCache) : m_Cache() , m_bUseFieldValueCache( bUseFieldValueCache ) - , nLang( nLng ) - , bIsAutomaticLanguage( true ) - , nFormat( nFmt ) - , pType( pTyp ) + , m_nLang( nLang ) + , m_bIsAutomaticLanguage( true ) + , m_nFormat( nFormat ) + , m_pType( pType ) { - OSL_ENSURE( pTyp, "SwField: no SwFieldType" ); + OSL_ENSURE( pType, "SwField: no SwFieldType" ); } SwField::~SwField() @@ -210,8 +210,8 @@ SwField::~SwField() #ifdef DBG_UTIL sal_uInt16 SwField::Which() const { - OSL_ENSURE(pType, "SwField: No FieldType"); - return pType->Which(); + OSL_ENSURE(m_pType, "SwField: No FieldType"); + return m_pType->Which(); } #endif @@ -219,7 +219,7 @@ sal_uInt16 SwField::GetTypeId() const { sal_uInt16 nRet; - switch( pType->Which() ) + switch (m_pType->Which()) { case RES_DATETIMEFLD: if (GetSubType() & FIXEDFLD) @@ -255,7 +255,7 @@ sal_uInt16 SwField::GetTypeId() const break; default: - nRet = aTypeTab[ pType->Which() ]; + nRet = aTypeTab[ m_pType->Which() ]; } return nRet; } @@ -312,7 +312,7 @@ bool SwField::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const switch( nWhichId ) { case FIELD_PROP_BOOL4: - rVal <<= !bIsAutomaticLanguage; + rVal <<= !m_bIsAutomaticLanguage; break; default: OSL_FAIL("illegal property"); @@ -328,7 +328,7 @@ bool SwField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) { bool bFixed = false; if(rVal >>= bFixed) - bIsAutomaticLanguage = !bFixed; + m_bIsAutomaticLanguage = !bFixed; } break; default: @@ -346,11 +346,11 @@ bool SwField::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId ) */ SwFieldType* SwField::ChgTyp( SwFieldType* pNewType ) { - OSL_ENSURE( pNewType && pNewType->Which() == pType->Which(), + OSL_ENSURE( pNewType && pNewType->Which() == m_pType->Which(), "no or different type" ); - SwFieldType* pOld = pType; - pType = pNewType; + SwFieldType* pOld = m_pType; + m_pType = pNewType; return pOld; } @@ -358,7 +358,7 @@ SwFieldType* SwField::ChgTyp( SwFieldType* pNewType ) bool SwField::HasClickHdl() const { bool bRet = false; - switch( pType->Which() ) + switch (m_pType->Which()) { case RES_INTERNETFLD: case RES_JUMPEDITFLD: @@ -376,20 +376,20 @@ bool SwField::HasClickHdl() const return bRet; } -void SwField::SetLanguage(sal_uInt16 nLng) +void SwField::SetLanguage(sal_uInt16 const nLang) { - nLang = nLng; + m_nLang = nLang; } -void SwField::ChangeFormat(sal_uInt32 n) +void SwField::ChangeFormat(sal_uInt32 const nFormat) { - nFormat = n; + m_nFormat = nFormat; } bool SwField::IsFixed() const { bool bRet = false; - switch( pType->Which() ) + switch (m_pType->Which()) { case RES_FIXDATEFLD: case RES_FIXTIMEFLD: |