summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editeng/source/items/frmitems.cxx22
1 files changed, 4 insertions, 18 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c98e34ed2e58..94d0eb8bcd09 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -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" );