changed CSimpleArray to std::vector

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

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

@@ -1555,7 +1555,7 @@ namespace OOX
 							pTransform = new CTintTransform( oReader );
 
 						if ( pTransform )
-							m_arrTransform.Add( pTransform );
+                            m_arrTransform.push_back ( pTransform );
 					}
 				}
 
@@ -1563,7 +1563,7 @@ namespace OOX
 				{
 					CString sResult;
 					
-					for ( int nIndex = 0; nIndex < m_arrTransform.GetSize(); nIndex++ )
+                    for ( int nIndex = 0; nIndex < m_arrTransform.size(); nIndex++ )
 						sResult += m_arrTransform[nIndex]->toXML();
 
 					return sResult;
@@ -1624,7 +1624,7 @@ namespace OOX
 
 					//    
 
-					int nCount = m_arrTransform.GetSize();
+                    int nCount = m_arrTransform.size();
 					for ( int nIndex = 0; nIndex < nCount; ++nIndex )
 					{
 						WritingElement* pTransform = m_arrTransform[nIndex];
@@ -2035,7 +2035,7 @@ namespace OOX
 				unsigned char m_unB; //
 
 				// Childs
-				CSimpleArray<WritingElement*> m_arrTransform;
+                std::vector<WritingElement*> m_arrTransform;
 
 			};
 
@@ -2566,4 +2566,4 @@ namespace OOX
 
 } // OOX
 
-#endif // OOX_LOGIC_DRAWING_COLORS_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_LOGIC_DRAWING_COLORS_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingEffects.cpp

@@ -546,7 +546,7 @@ namespace OOX
 		{
 			Clear();
 
-			for ( int nIndex = 0; nIndex < oOther.m_arrEffects.GetSize(); nIndex++ )
+            for ( int nIndex = 0; nIndex < oOther.m_arrEffects.size(); nIndex++ )
 			{
 				OOX::EElementType eType = oOther.m_arrEffects[nIndex]->getType();
 
@@ -564,7 +564,7 @@ namespace OOX
 				}
 
 				if ( NULL != pEffect )
-					m_arrEffects.Add( pEffect );
+                    m_arrEffects.push_back( pEffect );
 			}
 		}
 		void CEffectList::fromXML(XmlUtils::CXmlNode& oNode)
@@ -644,7 +644,7 @@ namespace OOX
 				}
 
 				if ( NULL != pEffect )
-					m_arrEffects.Add( pEffect );
+                    m_arrEffects.push_back ( pEffect );
 			}
 		}
 
@@ -652,7 +652,7 @@ namespace OOX
 		{
 			CString sResult = _T("<a:effectLst>");
 
-			for ( int nIndex = 0; nIndex < m_arrEffects.GetSize(); nIndex++ )
+            for ( int nIndex = 0; nIndex < m_arrEffects.size(); nIndex++ )
 				sResult += m_arrEffects[nIndex]->toXML();
 
 			sResult += _T("</a:effectLst>");
@@ -735,4 +735,4 @@ namespace OOX
 		}
 
 	} // OOX
-} // OOX
\ No newline at end of file
+} // OOX

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingEffects.h

@@ -136,7 +136,7 @@ namespace OOX
 
 			void Clear()
 			{
-				for ( int nIndex = 0; nIndex < m_arrEffects.GetSize(); nIndex++ )
+                for ( int nIndex = 0; nIndex < m_arrEffects.size(); nIndex++ )
 				{
 					if ( m_arrEffects[nIndex] )
 						delete m_arrEffects[nIndex];
@@ -144,13 +144,13 @@ namespace OOX
 					m_arrEffects[nIndex] = NULL;
 				}
 
-				m_arrEffects.RemoveAll();
+                m_arrEffects.clear();
 			}
 
 		public:
 
 			// Childs
-			CSimpleArray<WritingElement*>       m_arrEffects;
+            std::vector<WritingElement*>       m_arrEffects;
 
 		};
 
@@ -3519,4 +3519,4 @@ namespace OOX
 	} // Drawing
 } // OOX
 
-#endif // OOX_LOGIC_DRAWING_EFFECTS_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_LOGIC_DRAWING_EFFECTS_INCLUDE_H_