Kaydet (Commit) 20cc4639 authored tarafından Joseph Powers's avatar Joseph Powers

Remove unused parameter: XFillGradientItem

XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient)
pPool wasn't used so why pass it.
üst 9bccef29
...@@ -187,7 +187,7 @@ void SdDrawDocument::CreateLayoutTemplates() ...@@ -187,7 +187,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put(XFillStyleItem(XFILL_SOLID)); rISet.Put(XFillStyleItem(XFILL_SOLID));
rISet.Put(XFillColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_FILLING))); rISet.Put(XFillColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_FILLING)));
rISet.Put(XFillGradientItem(pPool,aNullGrad)); rISet.Put( XFillGradientItem( aNullGrad) );
rISet.Put(XFillHatchItem(pPool,aNullHatch)); rISet.Put(XFillHatchItem(pPool,aNullHatch));
Size aNullSize( 32, 32 ); Size aNullSize( 32, 32 );
Color aNullColor( COL_WHITE ); Color aNullColor( COL_WHITE );
......
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
XFillGradientItem(const UniString& rName, const XGradient& rTheGradient); XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient); XFillGradientItem(const XGradient& rTheGradient);
XFillGradientItem(const XFillGradientItem& rItem); XFillGradientItem(const XFillGradientItem& rItem);
XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0);
......
...@@ -1002,7 +1002,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM ...@@ -1002,7 +1002,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
} }
aGradAttr.Put(XFillStyleItem(XFILL_GRADIENT)); aGradAttr.Put(XFillStyleItem(XFILL_GRADIENT));
aGradAttr.Put(XFillGradientItem(&pModel->GetItemPool(), aXGradient)); aGradAttr.Put(XFillGradientItem(aXGradient));
pPath->SetMergedItemSet(aGradAttr); pPath->SetMergedItemSet(aGradAttr);
InsertObj(pPath); InsertObj(pPath);
......
...@@ -344,7 +344,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS ...@@ -344,7 +344,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS
aGradient.SetStartColor(aStartColor); aGradient.SetStartColor(aStartColor);
aGradient.SetEndColor(aEndColor); aGradient.SetEndColor(aEndColor);
aTempSet.Put(XFillGradientItem(aTempSet.GetPool(), aGradient)); aTempSet.Put(XFillGradientItem(aGradient));
aTempSet.Put(XFillTransparenceItem(nShadowTransparence)); aTempSet.Put(XFillTransparenceItem(nShadowTransparence));
} }
......
...@@ -3282,7 +3282,7 @@ XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) : ...@@ -3282,7 +3282,7 @@ XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
//************************************************************************* //*************************************************************************
XFillGradientItem::XFillGradientItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient) XFillGradientItem::XFillGradientItem( const XGradient& rTheGradient )
: NameOrIndex( XATTR_FILLGRADIENT, -1 ), : NameOrIndex( XATTR_FILLGRADIENT, -1 ),
aGradient(rTheGradient) aGradient(rTheGradient)
{ {
......
...@@ -94,7 +94,7 @@ XOutdevItemPool::XOutdevItemPool( ...@@ -94,7 +94,7 @@ XOutdevItemPool::XOutdevItemPool(
mppLocalPoolDefaults[XATTR_LINEJOINT -XATTR_START] = new XLineJointItem; mppLocalPoolDefaults[XATTR_LINEJOINT -XATTR_START] = new XLineJointItem;
mppLocalPoolDefaults[XATTR_FILLSTYLE -XATTR_START] = new XFillStyleItem; mppLocalPoolDefaults[XATTR_FILLSTYLE -XATTR_START] = new XFillStyleItem;
mppLocalPoolDefaults[XATTR_FILLCOLOR -XATTR_START] = new XFillColorItem (aNullStr,aNullFillCol); mppLocalPoolDefaults[XATTR_FILLCOLOR -XATTR_START] = new XFillColorItem (aNullStr,aNullFillCol);
mppLocalPoolDefaults[XATTR_FILLGRADIENT -XATTR_START] = new XFillGradientItem(this,aNullGrad); mppLocalPoolDefaults[XATTR_FILLGRADIENT -XATTR_START] = new XFillGradientItem(aNullGrad);
mppLocalPoolDefaults[XATTR_FILLHATCH -XATTR_START] = new XFillHatchItem (this,aNullHatch); mppLocalPoolDefaults[XATTR_FILLHATCH -XATTR_START] = new XFillHatchItem (this,aNullHatch);
mppLocalPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (this,aNullBmp); mppLocalPoolDefaults[XATTR_FILLBITMAP -XATTR_START] = new XFillBitmapItem (this,aNullBmp);
mppLocalPoolDefaults[XATTR_FILLTRANSPARENCE -XATTR_START] = new XFillTransparenceItem; mppLocalPoolDefaults[XATTR_FILLTRANSPARENCE -XATTR_START] = new XFillTransparenceItem;
......
...@@ -272,9 +272,8 @@ Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) ...@@ -272,9 +272,8 @@ Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
VirtualDevice* pVD = mpData->getVirtualDevice(); VirtualDevice* pVD = mpData->getVirtualDevice();
SdrObject* pBackgroundObject = mpData->getBackgroundObject(); SdrObject* pBackgroundObject = mpData->getBackgroundObject();
const SfxItemSet& rItemSet = pBackgroundObject->GetMergedItemSet();
pBackgroundObject->SetMergedItem(XFillStyleItem(XFILL_GRADIENT)); pBackgroundObject->SetMergedItem(XFillStyleItem(XFILL_GRADIENT));
pBackgroundObject->SetMergedItem(XFillGradientItem(rItemSet.GetPool(), GetGradient(nIndex)->GetGradient())); pBackgroundObject->SetMergedItem(XFillGradientItem(GetGradient(nIndex)->GetGradient()));
sdr::contact::SdrObjectVector aObjectVector; sdr::contact::SdrObjectVector aObjectVector;
aObjectVector.push_back(pBackgroundObject); aObjectVector.push_back(pBackgroundObject);
......
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