diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-15 09:09:35 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-01-15 14:07:03 +0100 |
commit | d54824438b29e433e6178a822e9207dfe28ef9af (patch) | |
tree | c05950254f8c541b1ee88a5dc648e933af129c07 /sw/source | |
parent | 7201d157a2ff2f0a8b6bb8fa57e31871187cbc81 (diff) |
sw: prefix members of SwAuthorField, SwBreakIt and SwCombinedCharField
Change-Id: Ic277b91a75602b0997ff68feb46a9cad9dae4e46
Reviewed-on: https://gerrit.libreoffice.org/47891
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/bastyp/breakit.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/fields/docufld.cxx | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx index 5287dd3286fd..75e961e22130 100644 --- a/sw/source/core/bastyp/breakit.cxx +++ b/sw/source/core/bastyp/breakit.cxx @@ -54,7 +54,7 @@ SwBreakIt * SwBreakIt::Get() SwBreakIt::SwBreakIt( const uno::Reference<uno::XComponentContext> & rxContext ) : m_xContext(rxContext) , m_xBreak(i18n::BreakIterator::create(m_xContext)) - , aForbiddenLang(LANGUAGE_DONTKNOW) + , m_aForbiddenLang(LANGUAGE_DONTKNOW) { } @@ -78,7 +78,7 @@ void SwBreakIt::GetForbidden_( const LanguageType aLang ) { LocaleDataWrapper aWrap(m_xContext, GetLanguageTag(aLang)); - aForbiddenLang = aLang; + m_aForbiddenLang = aLang; m_xForbidden.reset(new i18n::ForbiddenCharacters(aWrap.getForbiddenCharacters())); } diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 2b9158b52a6e..47a7463b298e 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -330,23 +330,23 @@ SwFieldType* SwAuthorFieldType::Copy() const SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFormat) : SwField(pTyp, nFormat) { - aContent = SwAuthorFieldType::Expand(GetFormat()); + m_aContent = SwAuthorFieldType::Expand(GetFormat()); } OUString SwAuthorField::Expand() const { if (!IsFixed()) - const_cast<SwAuthorField*>(this)->aContent = + const_cast<SwAuthorField*>(this)->m_aContent = SwAuthorFieldType::Expand(GetFormat()); - return aContent; + return m_aContent; } SwField* SwAuthorField::Copy() const { SwAuthorField *pTmp = new SwAuthorField( static_cast<SwAuthorFieldType*>(GetTyp()), GetFormat()); - pTmp->SetExpansion(aContent); + pTmp->SetExpansion(m_aContent); return pTmp; } @@ -363,7 +363,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const break; case FIELD_PROP_PAR1: - rAny <<= aContent; + rAny <<= m_aContent; break; default: @@ -388,7 +388,7 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) break; case FIELD_PROP_PAR1: - rAny >>= aContent; + rAny >>= m_aContent; break; default: @@ -2539,29 +2539,29 @@ SwFieldType* SwCombinedCharFieldType::Copy() const SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp, const OUString& rChars ) : SwField( pFTyp, 0 ), - sCharacters( rChars.copy( 0, std::min<sal_Int32>(rChars.getLength(), MAX_COMBINED_CHARACTERS) )) + m_sCharacters( rChars.copy( 0, std::min<sal_Int32>(rChars.getLength(), MAX_COMBINED_CHARACTERS) )) { } OUString SwCombinedCharField::Expand() const { - return sCharacters; + return m_sCharacters; } SwField* SwCombinedCharField::Copy() const { return new SwCombinedCharField( static_cast<SwCombinedCharFieldType*>(GetTyp()), - sCharacters ); + m_sCharacters ); } OUString SwCombinedCharField::GetPar1() const { - return sCharacters; + return m_sCharacters; } void SwCombinedCharField::SetPar1(const OUString& rStr) { - sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS)); + m_sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS)); } bool SwCombinedCharField::QueryValue( uno::Any& rAny, @@ -2570,7 +2570,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny, switch( nWhichId ) { case FIELD_PROP_PAR1: - rAny <<= sCharacters; + rAny <<= m_sCharacters; break; default: assert(false); |