summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-07-25 09:07:32 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2018-07-25 10:06:18 +0200
commit921f285c7ff713ad219d3e3385d7e7d12d33581e (patch)
treebb462c228e1eee2c2eeef820f632cc47a3ceb2de /sw/inc
parentfbd79e4b2dfdcad415c9de589dd3e509d1fc0f56 (diff)
sw: prefix members of SwGetExpField and SwGetRefField
Change-Id: I703357694eb2f880fa9cc5240fcc5610bd34e924 Reviewed-on: https://gerrit.libreoffice.org/57950 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/expfld.hxx16
-rw-r--r--sw/inc/reffld.hxx22
2 files changed, 19 insertions, 19 deletions
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 952e7fcc5402..ecdba62d7c9c 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -85,11 +85,11 @@ protected:
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
{
- OUString sExpand;
- bool bIsInBodyText;
- sal_uInt16 nSubType;
+ OUString m_sExpand;
+ bool m_bIsInBodyText;
+ sal_uInt16 m_nSubType;
- bool bLateInitialization; // #i82544#
+ bool m_bLateInitialization; // #i82544#
virtual OUString Expand() const override;
virtual std::unique_ptr<SwField> Copy() const override;
@@ -126,19 +126,19 @@ public:
static sal_Int32 GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0);
// #i82544#
- void SetLateInitialization() { bLateInitialization = true;}
+ void SetLateInitialization() { m_bLateInitialization = true;}
};
inline void SwGetExpField::ChgExpStr(const OUString& rExpand)
- { sExpand = rExpand;}
+ { m_sExpand = rExpand;}
/// Called by formatting.
inline bool SwGetExpField::IsInBodyText() const
- { return bIsInBodyText; }
+ { return m_bIsInBodyText; }
/// Set by UpdateExpFields where node position is known.
inline void SwGetExpField::ChgBodyTextFlag( bool bIsInBody )
- { bIsInBodyText = bIsInBody; }
+ { m_bIsInBodyText = bIsInBody; }
class SwSetExpField;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 45ce7ddbc11c..a3764451f5a4 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -61,7 +61,7 @@ enum REFERENCEMARK
class SwGetRefFieldType : public SwFieldType
{
- SwDoc* pDoc;
+ SwDoc* m_pDoc;
protected:
/// Overlay in order to update all ref-fields.
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
@@ -69,7 +69,7 @@ public:
SwGetRefFieldType(SwDoc* pDoc );
virtual SwFieldType* Copy() const override;
- SwDoc* GetDoc() const { return pDoc; }
+ SwDoc* GetDoc() const { return m_pDoc; }
void MergeWithOtherDoc( SwDoc& rDestDoc );
@@ -81,11 +81,11 @@ public:
class SW_DLLPUBLIC SwGetRefField : public SwField
{
private:
- OUString sSetRefName;
- OUString sSetReferenceLanguage;
- OUString sText;
- sal_uInt16 nSubType;
- sal_uInt16 nSeqNo;
+ OUString m_sSetRefName;
+ OUString m_sSetReferenceLanguage;
+ OUString m_sText;
+ sal_uInt16 m_nSubType;
+ sal_uInt16 m_nSeqNo;
virtual OUString Expand() const override;
virtual std::unique_ptr<SwField> Copy() const override;
@@ -103,7 +103,7 @@ public:
virtual OUString GetFieldName() const override;
- const OUString& GetSetRefName() const { return sSetRefName; }
+ const OUString& GetSetRefName() const { return m_sSetRefName; }
// #i81002#
/** The <SwTextField> instance, which represents the text attribute for the
@@ -114,7 +114,7 @@ public:
no update for these reference format types. */
void UpdateField( const SwTextField* pFieldTextAttr );
- void SetExpand( const OUString& rStr ) { sText = rStr; }
+ void SetExpand( const OUString& rStr ) { m_sText = rStr; }
/// Get/set sub type.
virtual sal_uInt16 GetSubType() const override;
@@ -128,8 +128,8 @@ public:
OUString GetExpandedTextOfReferencedTextNode() const;
/// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD).
- sal_uInt16 GetSeqNo() const { return nSeqNo; }
- void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; }
+ sal_uInt16 GetSeqNo() const { return m_nSeqNo; }
+ void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; }
// Name of reference.
virtual OUString GetPar1() const override;