summaryrefslogtreecommitdiff
path: root/sw/inc
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/inc
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/inc')
-rw-r--r--sw/inc/doc.hxx4
-rw-r--r--sw/inc/swcalwrp.hxx4
2 files changed, 4 insertions, 4 deletions
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 );