diff -ur svx.o/inc/svx/svdmodel.hxx svx/inc/svx/svdmodel.hxx --- svx.o/inc/svx/svdmodel.hxx 2012-06-13 23:13:39.000000000 +0800 +++ svx/inc/svx/svdmodel.hxx 2012-08-23 09:47:36.024697600 +0800 @@ -658,17 +658,17 @@ const Link& GetIOProgressHdl() const { return aIOProgressLink; } // Zugriffsmethoden fuer Paletten, Listen und Tabellen - void SetColorTable(XColorTable* pTable) { pColorTable=pTable; } + void SetColorTable(XColorTable* pTable) ; XColorTable* GetColorTable() const { return pColorTable; } - void SetDashList(XDashList* pList) { pDashList=pList; } + void SetDashList(XDashList* pList) ; XDashList* GetDashList() const { return pDashList; } - void SetLineEndList(XLineEndList* pList) { pLineEndList=pList; } + void SetLineEndList(XLineEndList* pList) ; XLineEndList* GetLineEndList() const { return pLineEndList; } - void SetHatchList(XHatchList* pList) { pHatchList=pList; } + void SetHatchList(XHatchList* pList) ; XHatchList* GetHatchList() const { return pHatchList; } - void SetGradientList(XGradientList* pList) { pGradientList=pList; } + void SetGradientList(XGradientList* pList) ; XGradientList* GetGradientList() const { return pGradientList; } - void SetBitmapList(XBitmapList* pList) { pBitmapList=pList; } + void SetBitmapList(XBitmapList* pList) ; XBitmapList* GetBitmapList() const { return pBitmapList; } // Der StyleSheetPool wird der DrawingEngine nur bekanntgemacht. diff -ur svx.o/source/svdraw/svdmodel.cxx svx/source/svdraw/svdmodel.cxx --- svx.o/source/svdraw/svdmodel.cxx 2012-08-08 08:39:17.241852600 +0800 +++ svx/source/svdraw/svdmodel.cxx 2012-08-23 09:50:51.529702400 +0800 @@ -2182,6 +2182,16 @@ pItemPool->SetPoolDefaultItem( XLineColorItem(aNullStr,aNullLineCol) ); } +// +// i120668, move from the header files, add delete action +// +void SdrModel::SetColorTable(XColorTable* pTable) { delete pColorTable; pColorTable=pTable; } +void SdrModel::SetDashList(XDashList* pList) { delete pDashList; pDashList=pList; } +void SdrModel::SetLineEndList(XLineEndList* pList) { delete pLineEndList; pLineEndList=pList; } +void SdrModel::SetHatchList(XHatchList* pList) { delete pHatchList; pHatchList=pList; } +void SdrModel::SetGradientList(XGradientList* pList) { delete pGradientList; pGradientList=pList; } +void SdrModel::SetBitmapList(XBitmapList* pList) { delete pBitmapList; pBitmapList=pList; } + //////////////////////////////////////////////////////////////////////////////////////////////////// TYPEINIT1(SdrHint,SfxHint);