diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 5a4124bdec53..8c3b906b0d0c 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drawdoc4.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: ka $ $Date: 2000-09-21 16:11:07 $ + * last change: $Author: pw $ $Date: 2000-10-12 11:40:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -253,6 +253,7 @@ void SdDrawDocument::CreateLayoutTemplates() pSheet = &(pStyleSheetPool->Make(aName, SFX_STYLE_FAMILY_PARA, nMask)); pSheet->SetHelpId( aHelpFile, HID_STANDARD_STYLESHEET_NAME ); SfxItemSet& rISet = pSheet->GetItemSet(); + SfxItemPool* pPool = rISet.GetPool(); String aNullStr; @@ -271,9 +272,9 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(XLineStyleItem(XLINE_SOLID)); rISet.Put(XLineColorItem(String(), RGB_Color(COL_BLACK))); rISet.Put(XLineWidthItem(0)); - rISet.Put(XLineDashItem(aNullStr,aNullDash)); - rISet.Put(XLineStartItem(aNullStr,aNullPol)); - rISet.Put(XLineEndItem(aNullStr,aNullPol)); + rISet.Put(XLineDashItem(pPool,aNullDash)); + rISet.Put(XLineStartItem(pPool,aNullPol)); + rISet.Put(XLineEndItem(pPool,aNullPol)); rISet.Put(XLineStartWidthItem(300)); rISet.Put(XLineEndWidthItem(300)); rISet.Put(XLineStartCenterItem()); @@ -283,9 +284,9 @@ void SdDrawDocument::CreateLayoutTemplates() rISet.Put(XFillStyleItem(XFILL_SOLID)); rISet.Put(XFillColorItem(String(), Color(0,184,255))); // "Blau 7" - rISet.Put(XFillGradientItem(aNullStr,aNullGrad)); - rISet.Put(XFillHatchItem(aNullStr,aNullHatch)); - rISet.Put(XFillBitmapItem(aNullStr,aNullBmp)); + rISet.Put(XFillGradientItem(pPool,aNullGrad)); + rISet.Put(XFillHatchItem(pPool,aNullHatch)); + rISet.Put(XFillBitmapItem(pPool,aNullBmp)); // Schattenattribute (Drawing Engine) rISet.Put(SdrShadowItem(FALSE)); diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index 1f7914298db4..a8b8ac1ef7d1 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: sdview5.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:48:44 $ + * last change: $Author: pw $ $Date: 2000-10-12 11:42:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -228,7 +228,7 @@ SdrGrafObj* SdView::InsertGraphic(const Graphic& rGraphic, DropAction& rAction, XOBitmap aXOBitmap( rGraphic.GetBitmap() ); SfxItemSet aSet(pDocSh->GetPool(), XATTR_FILLSTYLE, XATTR_FILLBITMAP); aSet.Put(XFillStyleItem(XFILL_BITMAP)); - aSet.Put(XFillBitmapItem(String(), aXOBitmap)); + aSet.Put(XFillBitmapItem(&pDocSh->GetPool(), aXOBitmap)); pPickObj->SetAttributes(aSet, FALSE); } }