diff options
-rw-r--r-- | sw/inc/fchrfmt.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/fmtatr2.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/txtnode/txtatr2.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 982346afd9c5..03d1692115c1 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -30,7 +30,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient { friend class SwTextCharFormat; - SwTextCharFormat* pTextAttr; ///< My text attribute. + SwTextCharFormat* m_pTextAttribute; ///< My text attribute. public: /// single argument ctors shall be explicit. diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx index b2721257dd6c..c402166fee3d 100644 --- a/sw/source/core/txtnode/fmtatr2.cxx +++ b/sw/source/core/txtnode/fmtatr2.cxx @@ -61,14 +61,14 @@ SfxPoolItem* SwFormatINetFormat::CreateDefault() { return new SwFormatINetFormat SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat ) : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient(pFormat), - pTextAttr( nullptr ) + m_pTextAttribute( nullptr ) { } SwFormatCharFormat::SwFormatCharFormat( const SwFormatCharFormat& rAttr ) : SfxPoolItem( RES_TXTATR_CHARFMT ), SwClient( rAttr.GetCharFormat() ), - pTextAttr( nullptr ) + m_pTextAttribute( nullptr ) { } @@ -88,14 +88,14 @@ SfxPoolItem* SwFormatCharFormat::Clone( SfxItemPool* ) const // forward to the TextAttribute void SwFormatCharFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { - if( pTextAttr ) - pTextAttr->ModifyNotification( pOld, pNew ); + if( m_pTextAttribute ) + m_pTextAttribute->ModifyNotification( pOld, pNew ); } // forward to the TextAttribute bool SwFormatCharFormat::GetInfo( SfxPoolItem& rInfo ) const { - return pTextAttr && pTextAttr->GetInfo( rInfo ); + return m_pTextAttribute && m_pTextAttribute->GetInfo( rInfo ); } bool SwFormatCharFormat::QueryValue( uno::Any& rVal, sal_uInt8 ) const { diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 7efab4b169c5..69189e11f1f9 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -43,7 +43,7 @@ SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr, , m_pTextNode( nullptr ) , m_nSortNumber( 0 ) { - rAttr.pTextAttr = this; + rAttr.m_pTextAttribute = this; SetCharFormatAttr( true ); } |