memory leak

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

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h

@@ -1480,6 +1480,9 @@ namespace OOX
 				}
 				virtual ~CColorTransform()
 				{
+                    for ( unsigned int nIndex = 0; nIndex < m_arrTransform.size(); nIndex++ )
+						delete m_arrTransform[nIndex];
+					m_arrTransform.clear();
 				}
 
 			public:

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

@@ -284,8 +284,7 @@ namespace XmlUtils
 		}
 		virtual ~CXmlLiteReader()
 		{
-			if (NULL != m_pStream)
-				delete []m_pStream;
+			Clear();
 		}
 
 		xmlTextReaderPtr getNativeReader() { return reader; }
@@ -294,6 +293,7 @@ namespace XmlUtils
 
 		inline void Clear()
 		{
+			RELEASEMEM(reader);
 			if (NULL != m_pStream)
 				delete []m_pStream;
 			m_pStream = NULL;
@@ -461,7 +461,7 @@ namespace XmlUtils
 				return L"";
 
 			m_sTemp = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)pName, (LONG)strlen((const char*)pName));
-			delete [] pName;
+			free(pName);
 			return m_sTemp.c_str();
 		}
 		inline const char* GetNameA()
@@ -475,7 +475,7 @@ namespace XmlUtils
 
 			//return std::string((const char*)pName);
 			m_sTempA = (const char*)pName;
-			delete [] pName;
+			free(pName);
 			return m_sTempA.c_str();
 		}
 		inline int GetDepth()
@@ -506,7 +506,7 @@ namespace XmlUtils
 				return L"";
 			
 			m_sTemp = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)pValue, (LONG)strlen((const char*)pValue));
-			delete [] pValue;
+			free(pValue);
 			return m_sTemp.c_str();
 		}
 		inline const char* GetTextA()
@@ -519,7 +519,7 @@ namespace XmlUtils
 				return "";
 
 			m_sTempA = (const char*)pValue;
-			delete [] pValue;
+			free(pValue);
 			return m_sTempA.c_str();
 		}
 

DesktopEditor/fontengine/ApplicationFonts.cpp

@@ -57,7 +57,7 @@ CFontSelectFormat::~CFontSelectFormat()
 
 	RELEASEOBJECT(bFixedWidth);
 
-	RELEASEOBJECT(pPanose);
+	RELEASEARRAYOBJECTS(pPanose);
 
 	RELEASEOBJECT(ulRange1);
 	RELEASEOBJECT(ulRange2);

DesktopEditor/fontengine/FontManager.cpp

@@ -7,6 +7,7 @@ CFontStream::CFontStream()
 {
 	m_pData	= NULL;
 	m_lSize = 0;
+	m_lRef = 0;
 }
 CFontStream::~CFontStream()
 {

DesktopEditor/fontengine/GlyphString.cpp

@@ -23,7 +23,7 @@ TGlyphBitmap::~TGlyphBitmap()
 {
 	if (bFreeData && pData != NULL)
 	{
-		delete []pData;
+		free(pData);
 		pData = NULL;
 	}
 }