summaryrefslogtreecommitdiff
path: root/sw/source/core/bastyp
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-03-11 09:46:35 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-03-11 10:44:36 +0100
commit803b43efe86b51366a516648015efd3b39255f75 (patch)
tree1de4afc0f92d92aab5f2e7671e2b3bddbc524535 /sw/source/core/bastyp
parent768fe3967da6a8e51a4040f1cfb6cb6055d6010f (diff)
sw: prefix members of SwCalendarWrapper, SwDoc and SwFntAccess
Change-Id: Ia233670c8cc01442aa91588fd7aa5d65443af077 Reviewed-on: https://gerrit.libreoffice.org/69033 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sw/source/core/bastyp')
-rw-r--r--sw/source/core/bastyp/init.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c918d7919e53..3986bab90e51 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -432,7 +432,7 @@ SfxItemInfo aSlotTab[] =
std::vector<SvGlobalName> *pGlobalOLEExcludeList = nullptr;
-SwAutoCompleteWord* SwDoc::mpACmpltWords = nullptr;
+SwAutoCompleteWord* SwDoc::s_pAutoCompleteWords = nullptr;
SwCheckIt* pCheckIt = nullptr;
static CharClass* pAppCharClass = nullptr;
@@ -653,12 +653,12 @@ void InitCore()
if (!utl::ConfigManager::IsFuzzing())
{
const SvxSwAutoFormatFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
- SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
+ SwDoc::s_pAutoCompleteWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
rAFlags.nAutoCmpltWordLen );
}
else
{
- SwDoc::mpACmpltWords = new SwAutoCompleteWord( 0, 0 );
+ SwDoc::s_pAutoCompleteWords = new SwAutoCompleteWord( 0, 0 );
}
}
@@ -687,7 +687,7 @@ void FinitCore()
if ( aAttrTab[0]->GetRefCount() )
SfxItemPool::ReleaseDefaults( &aAttrTab );
#endif
- delete SwDoc::mpACmpltWords;
+ delete SwDoc::s_pAutoCompleteWords;
delete SwStyleNameMapper::s_pTextUINameArray;
delete SwStyleNameMapper::s_pListsUINameArray;
@@ -750,10 +750,10 @@ CharClass& GetAppCharClass()
void SwCalendarWrapper::LoadDefaultCalendar( LanguageType eLang )
{
- if( eLang != nLang )
+ if( eLang != m_nLang )
{
- nLang = eLang;
- loadDefaultCalendar( LanguageTag::convertToLocale( nLang ));
+ m_nLang = eLang;
+ loadDefaultCalendar( LanguageTag::convertToLocale( m_nLang ));
}
}