sw/source/core/inc/txmsrt.hxx | 10 ++++-----
sw/source/core/tox/txmsrt.cxx | 46 +++++++++++++++++++++---------------------
2 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit c2ce3a2dbebd17146aa5c073794eebcf411e8bed
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 19 08:20:36 2017 +0200
sw: prefix members of SwTOXInternational
Change-Id: Ib9769706e4f66a1ecae49869565e84091cd2279a
Reviewed-on: https://gerrit.libreoffice.org/38945
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index c4a8b9924cac..2bb74d78d725 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -69,11 +69,11 @@ struct TextAndReading
class SwTOXInternational
{
- IndexEntrySupplierWrapper* pIndexWrapper;
- CharClass* pCharClass;
- LanguageType eLang;
- OUString sSortAlgorithm;
- SwTOIOptions nOptions;
+ IndexEntrySupplierWrapper* m_pIndexWrapper;
+ CharClass* m_pCharClass;
+ LanguageType m_eLang;
+ OUString m_sSortAlgorithm;
+ SwTOIOptions m_nOptions;
void Init();
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 2a5d0b5d5b54..10cd898d4f31 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -52,58 +52,58 @@ SwTOIOptions SwTOXSortTabBase::nOpt = SwTOIOptions::NONE;
SwTOXInternational::SwTOXInternational( LanguageType nLang, SwTOIOptions nOpt,
const OUString& rSortAlgorithm ) :
- eLang( nLang ),
- sSortAlgorithm(rSortAlgorithm),
- nOptions( nOpt )
+ m_eLang( nLang ),
+ m_sSortAlgorithm(rSortAlgorithm),
+ m_nOptions( nOpt )
{
Init();
}
SwTOXInternational::SwTOXInternational( const SwTOXInternational& rIntl ) :
- eLang( rIntl.eLang ),
- sSortAlgorithm(rIntl.sSortAlgorithm),
- nOptions( rIntl.nOptions )
+ m_eLang( rIntl.m_eLang ),
+ m_sSortAlgorithm(rIntl.m_sSortAlgorithm),
+ m_nOptions( rIntl.m_nOptions )
{
Init();
}
void SwTOXInternational::Init()
{
- pIndexWrapper = new IndexEntrySupplierWrapper();
+ m_pIndexWrapper = new IndexEntrySupplierWrapper();
- const lang::Locale aLcl( LanguageTag::convertToLocale( eLang ) );
- pIndexWrapper->SetLocale( aLcl );
+ const lang::Locale aLcl( LanguageTag::convertToLocale( m_eLang ) );
+ m_pIndexWrapper->SetLocale( aLcl );
- if(sSortAlgorithm.isEmpty())
+ if(m_sSortAlgorithm.isEmpty())
{
- Sequence < OUString > aSeq( pIndexWrapper->GetAlgorithmList( aLcl ));
+ Sequence < OUString > aSeq( m_pIndexWrapper->GetAlgorithmList( aLcl ));
if(aSeq.getLength())
- sSortAlgorithm = aSeq.getConstArray()[0];
+ m_sSortAlgorithm = aSeq.getConstArray()[0];
}
- if ( nOptions & SwTOIOptions::CaseSensitive )
- pIndexWrapper->LoadAlgorithm( aLcl, sSortAlgorithm, 0 );
+ if ( m_nOptions & SwTOIOptions::CaseSensitive )
+ m_pIndexWrapper->LoadAlgorithm( aLcl, m_sSortAlgorithm, 0 );
else
- pIndexWrapper->LoadAlgorithm( aLcl, sSortAlgorithm,
SW_COLLATOR_IGNORES );
+ m_pIndexWrapper->LoadAlgorithm( aLcl, m_sSortAlgorithm,
SW_COLLATOR_IGNORES );
- pCharClass = new CharClass( LanguageTag( aLcl ));
+ m_pCharClass = new CharClass( LanguageTag( aLcl ));
}
SwTOXInternational::~SwTOXInternational()
{
- delete pCharClass;
- delete pIndexWrapper;
+ delete m_pCharClass;
+ delete m_pIndexWrapper;
}
OUString SwTOXInternational::ToUpper( const OUString& rStr, sal_Int32 nPos )
const
{
- return pCharClass->uppercase( rStr, nPos, 1 );
+ return m_pCharClass->uppercase( rStr, nPos, 1 );
}
inline bool SwTOXInternational::IsNumeric( const OUString& rStr ) const
{
- return pCharClass->isNumeric( rStr );
+ return m_pCharClass->isNumeric( rStr );
}
sal_Int32 SwTOXInternational::Compare( const TextAndReading& rTaR1,
@@ -111,19 +111,19 @@ sal_Int32 SwTOXInternational::Compare( const
TextAndReading& rTaR1,
const TextAndReading& rTaR2,
const lang::Locale& rLocale2 ) const
{
- return pIndexWrapper->CompareIndexEntry( rTaR1.sText, rTaR1.sReading,
rLocale1,
+ return m_pIndexWrapper->CompareIndexEntry( rTaR1.sText, rTaR1.sReading,
rLocale1,
rTaR2.sText, rTaR2.sReading,
rLocale2 );
}
OUString SwTOXInternational::GetIndexKey( const TextAndReading& rTaR,
const lang::Locale& rLocale ) const
{
- return pIndexWrapper->GetIndexKey( rTaR.sText, rTaR.sReading, rLocale );
+ return m_pIndexWrapper->GetIndexKey( rTaR.sText, rTaR.sReading, rLocale );
}
OUString SwTOXInternational::GetFollowingText( bool bMorePages ) const
{
- return pIndexWrapper->GetFollowingText( bMorePages );
+ return m_pIndexWrapper->GetFollowingText( bMorePages );
}
// SortElement for TOX entries
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
