summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2019-03-18 09:10:49 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-03-18 10:22:17 +0100
commitf7d657723221b3977aa075a7e8fa8f32110d7392 (patch)
treee23d812cb7b4eeb881296cab29f58d3ce06a6717 /sw/inc
parentf4a1dfe2ea2750467f2cc8cc50a14c656beda6ec (diff)
sw: prefix members of SwFormatChain, SwFormatHeader, SwFormatFooter and ...
... SwFormatFootnoteEndAtTextEnd Change-Id: I2b092c8a6d713e2741e99f334b2e9d2247cde6c2 Reviewed-on: https://gerrit.libreoffice.org/69380 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/fmtcnct.hxx8
-rw-r--r--sw/inc/fmtftntx.hxx28
-rw-r--r--sw/inc/fmthdft.hxx8
3 files changed, 22 insertions, 22 deletions
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index e85ac8db5b8b..4dcc89b44970 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -30,8 +30,8 @@ class IntlWrapper;
/// Connection (text flow) between two FlyFrames.
class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
{
- SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
- aNext; ///< Next SwFlyFrameFormat (if existent).
+ SwClient m_aPrev, ///< Previous SwFlyFrameFormat (if existent).
+ m_aNext; ///< Next SwFlyFrameFormat (if existent).
public:
SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
@@ -50,8 +50,8 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
- SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
+ SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aPrev.GetRegisteredIn())); }
+ SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(m_aNext.GetRegisteredIn())); }
void SetPrev( SwFlyFrameFormat *pFormat );
void SetNext( SwFlyFrameFormat *pFormat );
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 2cc217f0ae12..b6afeff29cdb 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -36,14 +36,14 @@ enum SwFootnoteEndPosEnum
class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem<SwFootnoteEndPosEnum>
{
- OUString sPrefix;
- OUString sSuffix;
- SvxNumberType aFormat;
- sal_uInt16 nOffset;
+ OUString m_sPrefix;
+ OUString m_sSuffix;
+ SvxNumberType m_aFormat;
+ sal_uInt16 m_nOffset;
protected:
SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
- : SfxEnumItem( nWhichL, ePos ), nOffset( 0 )
+ : SfxEnumItem( nWhichL, ePos ), m_nOffset( 0 )
{}
public:
@@ -66,19 +66,19 @@ public:
SwFormatFootnoteEndAtTextEnd(SwFormatFootnoteEndAtTextEnd const &) = default;
// SfxPoolItem copy function dichotomy
- SvxNumType GetNumType() const { return aFormat.GetNumberingType(); }
- void SetNumType( SvxNumType eType ) { aFormat.SetNumberingType(eType); }
+ SvxNumType GetNumType() const { return m_aFormat.GetNumberingType(); }
+ void SetNumType( SvxNumType eType ) { m_aFormat.SetNumberingType(eType); }
- const SvxNumberType& GetSwNumType() const { return aFormat; }
+ const SvxNumberType& GetSwNumType() const { return m_aFormat; }
- sal_uInt16 GetOffset() const { return nOffset; }
- void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; }
+ sal_uInt16 GetOffset() const { return m_nOffset; }
+ void SetOffset( sal_uInt16 nOff ) { m_nOffset = nOff; }
- const OUString& GetPrefix() const { return sPrefix; }
- void SetPrefix(const OUString& rSet) { sPrefix = rSet; }
+ const OUString& GetPrefix() const { return m_sPrefix; }
+ void SetPrefix(const OUString& rSet) { m_sPrefix = rSet; }
- const OUString& GetSuffix() const { return sSuffix; }
- void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
+ const OUString& GetSuffix() const { return m_sSuffix; }
+ void SetSuffix(const OUString& rSet) { m_sSuffix = rSet; }
};
class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index e8a0c7a95e08..25b338759062 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -32,7 +32,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
{
- bool const bActive; ///< Only for controlling (creation of content).
+ bool const m_bActive; ///< Only for controlling (creation of content).
public:
SwFormatHeader( bool bOn = false );
@@ -55,7 +55,7 @@ public:
SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
void RegisterToFormat( SwFormat& rFormat );
- bool IsActive() const { return bActive; }
+ bool IsActive() const { return m_bActive; }
};
/**Footer, for pageformats
@@ -63,7 +63,7 @@ public:
class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
{
- bool const bActive; // Only for controlling (creation of content).
+ bool const m_bActive; // Only for controlling (creation of content).
public:
SwFormatFooter( bool bOn = false );
@@ -86,7 +86,7 @@ public:
SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
void RegisterToFormat( SwFormat& rFormat );
- bool IsActive() const { return bActive; }
+ bool IsActive() const { return m_bActive; }
};
inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const