sw/inc/fmtrfmrk.hxx | 10 +++++----- sw/source/core/txtnode/atrref.cxx | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-)
New commits: commit 84ccf8051f5d39414621417292f4054cfb4454e1 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Mon Sep 25 09:18:12 2017 +0200 sw: prefix members of SwFormatRefMark Change-Id: I1036b8190532adb65d28d704637cf6f94d254235 diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index eb0d2cce61bd..494f4d187bde 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -38,10 +38,10 @@ class SwFormatRefMark , public SwModify { friend class SwTextRefMark; - SwTextRefMark* pTextAttr; + SwTextRefMark* m_pTextAttr; SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) = delete; - OUString aRefName; + OUString m_aRefName; css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark; @@ -60,10 +60,10 @@ public: void InvalidateRefMark(); - const SwTextRefMark *GetTextRefMark() const { return pTextAttr; } + const SwTextRefMark *GetTextRefMark() const { return m_pTextAttr; } - OUString &GetRefName() { return aRefName; } - const OUString &GetRefName() const { return aRefName; } + OUString &GetRefName() { return m_aRefName; } + const OUString &GetRefName() const { return m_aRefName; } css::uno::WeakReference<css::text::XTextContent> const& GetXRefMark() const { return m_wXReferenceMark; } diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx index dfe4af3e075e..019a3a6d7bf4 100644 --- a/sw/source/core/txtnode/atrref.cxx +++ b/sw/source/core/txtnode/atrref.cxx @@ -31,23 +31,23 @@ SwFormatRefMark::~SwFormatRefMark( ) SwFormatRefMark::SwFormatRefMark( const OUString& rName ) : SfxPoolItem(RES_TXTATR_REFMARK) , SwModify(nullptr) - , pTextAttr(nullptr) - , aRefName(rName) + , m_pTextAttr(nullptr) + , m_aRefName(rName) { } SwFormatRefMark::SwFormatRefMark( const SwFormatRefMark& rAttr ) : SfxPoolItem(RES_TXTATR_REFMARK) , SwModify(nullptr) - , pTextAttr(nullptr) - , aRefName(rAttr.aRefName) + , m_pTextAttr(nullptr) + , m_aRefName(rAttr.m_aRefName) { } bool SwFormatRefMark::operator==( const SfxPoolItem& rAttr ) const { assert(SfxPoolItem::operator==(rAttr)); - return aRefName == static_cast<const SwFormatRefMark&>(rAttr).aRefName; + return m_aRefName == static_cast<const SwFormatRefMark&>(rAttr).m_aRefName; } SfxPoolItem* SwFormatRefMark::Clone( SfxItemPool* ) const @@ -80,7 +80,7 @@ SwTextRefMark::SwTextRefMark( SwFormatRefMark& rAttr, , m_pTextNode( nullptr ) , m_pEnd( nullptr ) { - rAttr.pTextAttr = this; + rAttr.m_pTextAttr = this; if ( pEnd ) { m_nEnd = *pEnd; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits