incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhan...@apache.org
Subject svn commit: r1380436 - in /incubator/ooo/trunk/main/svx: inc/svx/svdmodel.hxx source/svdraw/svdmodel.cxx
Date Tue, 04 Sep 2012 02:31:38 GMT
Author: zhangjf
Date: Tue Sep  4 02:31:37 2012
New Revision: 1380436

URL: http://svn.apache.org/viewvc?rev=1380436&view=rev
Log:
#i120668#, when calling SdrModel::Setxxx(), need free old object at first

Found by: zhangjf 
Patch by: zhangjf

Modified:
    incubator/ooo/trunk/main/svx/inc/svx/svdmodel.hxx
    incubator/ooo/trunk/main/svx/source/svdraw/svdmodel.cxx

Modified: incubator/ooo/trunk/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/svx/svdmodel.hxx?rev=1380436&r1=1380435&r2=1380436&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/svx/svdmodel.hxx (original)
+++ incubator/ooo/trunk/main/svx/inc/svx/svdmodel.hxx Tue Sep  4 02:31:37 2012
@@ -658,17 +658,17 @@ public:
 	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.

Modified: incubator/ooo/trunk/main/svx/source/svdraw/svdmodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/svdraw/svdmodel.cxx?rev=1380436&r1=1380435&r2=1380436&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/svdraw/svdmodel.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/svdraw/svdmodel.cxx Tue Sep  4 02:31:37 2012
@@ -2182,6 +2182,16 @@ void SdrModel::SetDrawingLayerPoolDefaul
 	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);



Mime
View raw message