Kaydet (Commit) 763c4772 authored tarafından Caolán McNamara's avatar Caolán McNamara

make this operator= a little less crazy

if SetGraphicPos was called with GPOS_NONE then
xGraphicObject, maStrLink and maStrFilter are
in a suitable state to copy to get the same
results as explicitly forced here

Change-Id: Id072590e92e0c083a3cbc443db0e85d9dbfa73f0
Reviewed-on: https://gerrit.libreoffice.org/30780Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0220020a
......@@ -3672,29 +3672,15 @@ bool SvxBrushItem::GetPresentation
SvxBrushItem& SvxBrushItem::operator=(const SvxBrushItem& rItem)
{
aColor = rItem.aColor;
eGraphicPos = rItem.eGraphicPos;
xGraphicObject.reset();
maStrLink.clear();
maStrFilter.clear();
if ( GPOS_NONE != eGraphicPos )
{
maStrLink = rItem.maStrLink;
maStrFilter = rItem.maStrFilter;
if (rItem.xGraphicObject)
{
xGraphicObject.reset(new GraphicObject(*rItem.xGraphicObject));
}
}
nShadingValue = rItem.nShadingValue;
xGraphicObject.reset(rItem.xGraphicObject ? new GraphicObject(*rItem.xGraphicObject) : nullptr);
nGraphicTransparency = rItem.nGraphicTransparency;
maStrLink = rItem.maStrLink;
maStrFilter = rItem.maStrFilter;
eGraphicPos = rItem.eGraphicPos;
return *this;
}
bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment