summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-17 15:41:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-01-18 10:59:59 +0200
commit08d063eefebeaf9950af579f707d445ac60e5389 (patch)
tree69afbb9a297d739b3742ff948187f99714637a75 /editeng
parente223f92654991356f7d6503f8929849812446076 (diff)
manage pField with tools::SvRef
since it is a SvRefBase subclass Change-Id: Ib7d1e22336d673405d7455d40464df29f547d351
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/flditem.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 6ff64b926bbe..1d5ba3fa784e 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -271,21 +271,21 @@ MetaAction* SvxFieldData::createEndComment()
SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
SfxPoolItem( nId )
- , pField( pFld ) // belongs directly to the item
+ , mxField( pFld ) // belongs directly to the item
{
}
SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
SfxPoolItem( nId )
- , pField( rField.Clone() )
+ , mxField( rField.Clone() )
{
}
SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
SfxPoolItem ( rItem )
- , pField( rItem.GetField() ? rItem.GetField()->Clone() : nullptr )
+ , mxField( rItem.GetField() ? rItem.GetField()->Clone() : nullptr )
{
}
@@ -319,19 +319,19 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
- DBG_ASSERT( pField, "SvxFieldItem::Store: Field?!" );
+ DBG_ASSERT( mxField.get(), "SvxFieldItem::Store: Field?!" );
SvPersistStream aPStrm( GetClassManager(), &rStrm );
// The reset error in the above Create method did not exist in 3.1,
// therefore newer items can not be saved for 3.x-exports!
- if ( ( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_31 ) && pField &&
- pField->GetClassId() == 50 /* SdrMeasureField */ )
+ if ( ( rStrm.GetVersion() <= SOFFICE_FILEFORMAT_31 ) && mxField.get() &&
+ mxField->GetClassId() == 50 /* SdrMeasureField */ )
{
// SvxFieldData not enough, because not registered on ClassMgr.
SvxURLField aDummyData;
WriteSvPersistBase( aPStrm , &aDummyData );
}
else
- WriteSvPersistBase( aPStrm, pField.get() );
+ WriteSvPersistBase( aPStrm, mxField.get() );
return rStrm;
}
@@ -342,12 +342,12 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
assert(SfxPoolItem::operator==(rItem));
const SvxFieldData* pOtherFld = static_cast<const SvxFieldItem&>(rItem).GetField();
- if( pField.get() == pOtherFld )
+ if( mxField.get() == pOtherFld )
return true;
- if( pField == nullptr || pOtherFld == nullptr )
+ if( mxField == nullptr || pOtherFld == nullptr )
return false;
- return ( typeid(*pField) == typeid(*pOtherFld) )
- && ( *pField == *pOtherFld );
+ return ( typeid(*mxField) == typeid(*pOtherFld) )
+ && ( *mxField == *pOtherFld );
}