diff options
| -rw-r--r-- | sd/source/core/drawdoc4.cxx | 2 | ||||
| -rw-r--r-- | svx/inc/svx/xflgrit.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdfmtf.cxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xattr.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xpool.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabgrdt.cxx | 3 |
7 files changed, 7 insertions, 8 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index bf452a4c0ae1..9cafe9608918 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -187,7 +187,7 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(XFillStyleItem(XFILL_SOLID)); rISet.Put(XFillColorItem(String(), RGB_Color(COL_DEFAULT_SHAPE_FILLING))); - rISet.Put(XFillGradientItem(pPool,aNullGrad)); + rISet.Put( XFillGradientItem( aNullGrad) ); rISet.Put(XFillHatchItem(pPool,aNullHatch)); Size aNullSize( 32, 32 ); Color aNullColor( COL_WHITE ); diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index c75e109f6b51..61ebf03c700f 100644 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -47,7 +47,7 @@ public: XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} XFillGradientItem(sal_Int32 nIndex, 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(SvStream& rIn, sal_uInt16 nVer = 0); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index ca4667aec226..0be5e6843903 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1002,7 +1002,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM } aGradAttr.Put(XFillStyleItem(XFILL_GRADIENT)); - aGradAttr.Put(XFillGradientItem(&pModel->GetItemPool(), aXGradient)); + aGradAttr.Put(XFillGradientItem(aXGradient)); pPath->SetMergedItemSet(aGradAttr); InsertObj(pPath); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index ab9818fcdd45..21918f7bd8c2 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -344,7 +344,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS aGradient.SetStartColor(aStartColor); aGradient.SetEndColor(aEndColor); - aTempSet.Put(XFillGradientItem(aTempSet.GetPool(), aGradient)); + aTempSet.Put(XFillGradientItem(aGradient)); aTempSet.Put(XFillTransparenceItem(nShadowTransparence)); } diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 458811204216..99573f829d04 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -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 ), aGradient(rTheGradient) { diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 6f239ec93229..a8c0e5c47a81 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -94,7 +94,7 @@ XOutdevItemPool::XOutdevItemPool( mppLocalPoolDefaults[XATTR_LINEJOINT -XATTR_START] = new XLineJointItem; mppLocalPoolDefaults[XATTR_FILLSTYLE -XATTR_START] = new XFillStyleItem; 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_FILLBITMAP -XATTR_START] = new XFillBitmapItem (this,aNullBmp); mppLocalPoolDefaults[XATTR_FILLTRANSPARENCE -XATTR_START] = new XFillTransparenceItem; diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 9e45e131aa5c..715a5ab5aa9c 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -272,9 +272,8 @@ Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) VirtualDevice* pVD = mpData->getVirtualDevice(); SdrObject* pBackgroundObject = mpData->getBackgroundObject(); - const SfxItemSet& rItemSet = pBackgroundObject->GetMergedItemSet(); pBackgroundObject->SetMergedItem(XFillStyleItem(XFILL_GRADIENT)); - pBackgroundObject->SetMergedItem(XFillGradientItem(rItemSet.GetPool(), GetGradient(nIndex)->GetGradient())); + pBackgroundObject->SetMergedItem(XFillGradientItem(GetGradient(nIndex)->GetGradient())); sdr::contact::SdrObjectVector aObjectVector; aObjectVector.push_back(pBackgroundObject); |