Skip to content

C
core
Kaydet (Commit) ef0323b0 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

using the other ctor can shrink this code 

Change-Id: Ied607a78c9aaec3cb0ee9dc0e2938c69a62d031e
üst f4785d57
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 25 deletions
svx/source/unodraw/unoshape.cxx
Dosyayı görüntüle @ ef0323b0
...@@ -1437,11 +1437,8 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, ...@@ -1437,11 +1437,8 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
return false; return false;
const XBitmapEntry* pEntry = pBitmapList->GetBitmap(nPos); const XBitmapEntry* pEntry = pBitmapList->GetBitmap(nPos);
XFillBitmapItem aBmpItem; XFillBitmapItem aBmpItem(rName, pEntry->GetGraphicObject());
aBmpItem.SetWhich( XATTR_FILLBITMAP ); rSet.Put(aBmpItem);
aBmpItem.SetName( rName );
aBmpItem.SetGraphicObject(pEntry->GetGraphicObject());
rSet.Put( aBmpItem );
break; break;
} }
case XATTR_FILLGRADIENT: case XATTR_FILLGRADIENT:
...@@ -1456,10 +1453,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, ...@@ -1456,10 +1453,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
return false; return false;
const XGradientEntry* pEntry = pGradientList->GetGradient(nPos); const XGradientEntry* pEntry = pGradientList->GetGradient(nPos);
XFillGradientItem aGrdItem; XFillGradientItem aGrdItem(rName, pEntry->GetGradient());
aGrdItem.SetWhich( XATTR_FILLGRADIENT );
aGrdItem.SetName( rName );
aGrdItem.SetGradientValue( pEntry->GetGradient() );
rSet.Put( aGrdItem ); rSet.Put( aGrdItem );
break; break;
} }
...@@ -1475,10 +1469,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, ...@@ -1475,10 +1469,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
return false; return false;
const XHatchEntry* pEntry = pHatchList->GetHatch( nPos ); const XHatchEntry* pEntry = pHatchList->GetHatch( nPos );
XFillHatchItem aHatchItem; XFillHatchItem aHatchItem(rName, pEntry->GetHatch());
aHatchItem.SetWhich( XATTR_FILLHATCH );
aHatchItem.SetName( rName );
aHatchItem.SetHatchValue( pEntry->GetHatch() );
rSet.Put( aHatchItem ); rSet.Put( aHatchItem );
break; break;
} }
...@@ -1497,18 +1488,12 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, ...@@ -1497,18 +1488,12 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos);
if( XATTR_LINEEND == nWID ) if( XATTR_LINEEND == nWID )
{ {
XLineEndItem aLEItem; XLineEndItem aLEItem(rName, pEntry->GetLineEnd());
aLEItem.SetWhich( XATTR_LINEEND );
aLEItem.SetName( rName );
aLEItem.SetLineEndValue( pEntry->GetLineEnd() );
rSet.Put( aLEItem ); rSet.Put( aLEItem );
} }
else else
{ {
XLineStartItem aLSItem; XLineStartItem aLSItem(rName, pEntry->GetLineEnd());
aLSItem.SetWhich( XATTR_LINESTART );
aLSItem.SetName( rName );
aLSItem.SetLineStartValue( pEntry->GetLineEnd() );
rSet.Put( aLSItem ); rSet.Put( aLSItem );
} }
...@@ -1526,10 +1511,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, ...@@ -1526,10 +1511,7 @@ bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName,
return false; return false;
const XDashEntry* pEntry = pDashList->GetDash(nPos); const XDashEntry* pEntry = pDashList->GetDash(nPos);
XLineDashItem aDashItem; XLineDashItem aDashItem(rName, pEntry->GetDash());
aDashItem.SetWhich( XATTR_LINEDASH );
aDashItem.SetName( rName );
aDashItem.SetDashValue( pEntry->GetDash() );
rSet.Put( aDashItem ); rSet.Put( aDashItem );
break; break;
} }
......
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