summaryrefslogtreecommitdiff
path: root/sw/inc/fldbas.hxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-04-21 17:23:34 +0200
committerMichael Stahl <mstahl@redhat.com>2015-04-21 20:36:26 +0200
commit84a6758609fc9472c7cb5a2e449860bcc554ed58 (patch)
tree26a6ab2af38879d6230328b3ae38e3a59d234d46 /sw/inc/fldbas.hxx
parent7d42346ba77c9c4df241ea40eaf550993ca18783 (diff)
sw: prefix members of SwFieldType
Change-Id: Ib07a3c15cb48998d0acb5bfae4e902a2d729b648
Diffstat (limited to 'sw/inc/fldbas.hxx')
-rw-r--r--sw/inc/fldbas.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index c5967c691e09..61cf2b54b20b 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -237,10 +237,10 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
::com::sun::star::uno::WeakReference<
::com::sun::star::beans::XPropertySet> m_wXFieldMaster;
- sal_uInt16 nWhich;
+ sal_uInt16 m_nWhich;
friend void _FinitUI(); ///< In order to delete pointer!
- static std::vector<OUString>* pFldNames;
+ static std::vector<OUString>* s_pFldNames;
static void _GetFldName(); ///< Sets up FldNames; fldmgr.cxx!
@@ -265,7 +265,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- sal_uInt16 Which() const { return nWhich; }
+ sal_uInt16 Which() const { return m_nWhich; }
inline void UpdateFlds() const;
};