[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/doc.hxx                      |    4 ++--
 sw/inc/swcalwrp.hxx                 |    4 ++--
 sw/source/core/bastyp/init.cxx      |   14 +++++++-------
 sw/source/core/inc/fntcache.hxx     |    2 +-
 sw/source/core/txtnode/fntcache.cxx |    4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 803b43efe86b51366a516648015efd3b39255f75
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Mar 11 09:46:35 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Mar 11 10:44:36 2019 +0100

    sw: prefix members of SwCalendarWrapper, SwDoc and SwFntAccess
    
    Change-Id: Ia233670c8cc01442aa91588fd7aa5d65443af077
    Reviewed-on: https://gerrit.libreoffice.org/69033
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e0b38cbf51f8..3ebbec5e1cc2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -320,7 +320,7 @@ private:
     //       Thus, certain adjustment needed during formatting for these kind of anchored objects.
     bool mbContainsAtPageObjWithContentAnchor : 1;
 
-    static SwAutoCompleteWord *mpACmpltWords;  //< List of all words for AutoComplete
+    static SwAutoCompleteWord *s_pAutoCompleteWords;  //< List of all words for AutoComplete
 
     // private methods
     SwFlyFrameFormat* MakeFlySection_( const SwPosition& rAnchPos,
@@ -1516,7 +1516,7 @@ public:
     SwExtTextInput* GetExtTextInput() const;
 
     // Interface for access to AutoComplete-List.
-    static SwAutoCompleteWord& GetAutoCompleteWords() { return *mpACmpltWords; }
+    static SwAutoCompleteWord& GetAutoCompleteWords() { return *s_pAutoCompleteWords; }
 
     bool ContainsMSVBasic() const          { return mbContains_MSVBasic; }
     void SetContainsMSVBasic( bool bFlag )  { mbContains_MSVBasic = bFlag; }
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index 00711143736d..c4e6b0d634ab 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -31,11 +31,11 @@ template <typename> class SingletonRef;
 
 class SwCalendarWrapper : public CalendarWrapper
 {
-    LanguageType nLang;
+    LanguageType m_nLang;
 
 public:
     SwCalendarWrapper( const css::uno::Reference< css::uno::XComponentContext > & rxContext = ::comphelper::getProcessComponentContext() )
-        : CalendarWrapper( rxContext ), nLang( LANGUAGE_SYSTEM )
+        : CalendarWrapper( rxContext ), m_nLang( LANGUAGE_SYSTEM )
     {}
 
     void LoadDefaultCalendar( LanguageType nLang );
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 ));
     }
 }
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 04cfc4abc219..c025c6c283ac 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -148,7 +148,7 @@ SwFntObj *SwFntCache::Next( SwFntObj *pFntObj)
 
 class SwFntAccess : public SwCacheAccess
 {
-    SwViewShell const *pShell;
+    SwViewShell const *m_pShell;
 protected:
     virtual SwCacheObj *NewObj( ) override;
 
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 1a9ad25b933c..f9352dcc5936 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2263,7 +2263,7 @@ SwFntAccess::SwFntAccess( const void* & rnFontCacheId,
                 sal_uInt16 &rIndex, const void *pOwn, SwViewShell const *pSh,
                 bool bCheck ) :
   SwCacheAccess( *pFntCache, rnFontCacheId, rIndex ),
-  pShell( pSh )
+  m_pShell( pSh )
 {
     // the used ctor of SwCacheAccess searches for rnFontCacheId+rIndex in the cache
     if ( IsAvail() )
@@ -2366,7 +2366,7 @@ SwFntAccess::SwFntAccess( const void* & rnFontCacheId,
 SwCacheObj *SwFntAccess::NewObj( )
 {
     // a new Font, a new "MagicNumber".
-    return new SwFntObj( *static_cast<SwSubFont const *>(m_pOwner), ++mnFontCacheIdCounter, pShell );
+    return new SwFntObj( *static_cast<SwSubFont const *>(m_pOwner), ++mnFontCacheIdCounter, m_pShell );
 }
 
 TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const & rInf, long nTextWidth)