memory leak

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59196 954022d7-b5bf-4e40-9824-e11837661b57

ASCHTMLRenderer/ASCSVGWriter.cpp

@@ -49,9 +49,11 @@ namespace NSHtmlRenderer
 		RELEASEOBJECT(m_pPen);
 		RELEASEOBJECT(m_pBrush);
 		RELEASEOBJECT(m_pFont);
+		RELEASEOBJECT(m_pInstalledFont);
 		RELEASEOBJECT(m_pBaseTransform);
 		RELEASEOBJECT(m_pTransform);
 		RELEASEOBJECT(m_pFullTransform);
+		RELEASEOBJECT(m_pVectorWriter);
 	}
 
 	HRESULT CASCSVGWriter::get_Type(LONG* lType)

ASCHTMLRenderer/CASCSVGRenderer.cpp

@@ -91,6 +91,7 @@ namespace NSHtmlRenderer
 		RELEASEOBJECT(m_pPen);
 		RELEASEOBJECT(m_pBrush);
 		RELEASEOBJECT(m_pFont);
+		RELEASEOBJECT(m_pInstalledFont);
 		RELEASEOBJECT(m_pBaseTransform);
 		RELEASEOBJECT(m_pTransform);
 		RELEASEOBJECT(m_pFullTransform);

Common/DocxFormat/Source/XML/libxml2/libxml2.h

@@ -293,7 +293,8 @@ namespace XmlUtils
 
 		inline void Clear()
 		{
-			RELEASEMEM(reader);
+			xmlFreeTextReader(reader);
+			reader = NULL;
 			if (NULL != m_pStream)
 				delete []m_pStream;
 			m_pStream = NULL;

Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.h

@@ -1617,6 +1617,7 @@ namespace OOX{
 			void toXML(CString& sNodeName, XmlUtils::CStringWriter& writer) const;
 			EElementType getType();
 		private: void toXML(XmlUtils::CStringWriter& writer, bool bIsAttribute, ItemsChoiceType3 eType, void* pVal) const;
+		private: void toDelete(ItemsChoiceType3 eType, void* pVal);
 		};
 		class CT_DLbl
 		{
@@ -1635,6 +1636,7 @@ namespace OOX{
 			void toXML(CString& sNodeName, XmlUtils::CStringWriter& writer) const;
 			EElementType getType();
 		private: void toXML(XmlUtils::CStringWriter& writer, bool bIsAttribute, ItemsChoiceType4 eType, void* pVal) const;
+		private: void toDelete(ItemsChoiceType4 eType, void* pVal);
 		};
 		class CT_DLblPos
 		{
@@ -2778,7 +2780,9 @@ namespace OOX{
 			void toXML(CString& sNodeName, XmlUtils::CStringWriter& writer) const;
 			EElementType getType();
 		private: void toXML(XmlUtils::CStringWriter& writer, bool bIsAttribute, ItemsChoiceType5 eType, void* pVal) const;
+		private: void toDelete(ItemsChoiceType5 eType, void* pVal);
 		private: void toXML(XmlUtils::CStringWriter& writer, bool bIsAttribute, ItemsChoiceType6 eType, void* pVal) const;
+ 		private: void toDelete(ItemsChoiceType6 eType, void* pVal);
 		};
 		class CT_Thickness
 		{