Commit 66eee8fb authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

changed CSimpleArray to std::vector

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58018 954022d7-b5bf-4e40-9824-e11837661b57
parent 97a97e47
...@@ -1555,7 +1555,7 @@ namespace OOX ...@@ -1555,7 +1555,7 @@ namespace OOX
pTransform = new CTintTransform( oReader ); pTransform = new CTintTransform( oReader );
if ( pTransform ) if ( pTransform )
m_arrTransform.Add( pTransform ); m_arrTransform.push_back ( pTransform );
} }
} }
...@@ -1563,7 +1563,7 @@ namespace OOX ...@@ -1563,7 +1563,7 @@ namespace OOX
{ {
CString sResult; 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(); sResult += m_arrTransform[nIndex]->toXML();
return sResult; return sResult;
...@@ -1624,7 +1624,7 @@ namespace OOX ...@@ -1624,7 +1624,7 @@ namespace OOX
// //
int nCount = m_arrTransform.GetSize(); int nCount = m_arrTransform.size();
for ( int nIndex = 0; nIndex < nCount; ++nIndex ) for ( int nIndex = 0; nIndex < nCount; ++nIndex )
{ {
WritingElement* pTransform = m_arrTransform[nIndex]; WritingElement* pTransform = m_arrTransform[nIndex];
...@@ -2035,7 +2035,7 @@ namespace OOX ...@@ -2035,7 +2035,7 @@ namespace OOX
unsigned char m_unB; // unsigned char m_unB; //
// Childs // Childs
CSimpleArray<WritingElement*> m_arrTransform; std::vector<WritingElement*> m_arrTransform;
}; };
...@@ -2566,4 +2566,4 @@ namespace OOX ...@@ -2566,4 +2566,4 @@ namespace OOX
} // OOX } // OOX
#endif // OOX_LOGIC_DRAWING_COLORS_INCLUDE_H_ #endif // OOX_LOGIC_DRAWING_COLORS_INCLUDE_H_
\ No newline at end of file
...@@ -546,7 +546,7 @@ namespace OOX ...@@ -546,7 +546,7 @@ namespace OOX
{ {
Clear(); 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(); OOX::EElementType eType = oOther.m_arrEffects[nIndex]->getType();
...@@ -564,7 +564,7 @@ namespace OOX ...@@ -564,7 +564,7 @@ namespace OOX
} }
if ( NULL != pEffect ) if ( NULL != pEffect )
m_arrEffects.Add( pEffect ); m_arrEffects.push_back( pEffect );
} }
} }
void CEffectList::fromXML(XmlUtils::CXmlNode& oNode) void CEffectList::fromXML(XmlUtils::CXmlNode& oNode)
...@@ -644,7 +644,7 @@ namespace OOX ...@@ -644,7 +644,7 @@ namespace OOX
} }
if ( NULL != pEffect ) if ( NULL != pEffect )
m_arrEffects.Add( pEffect ); m_arrEffects.push_back ( pEffect );
} }
} }
...@@ -652,7 +652,7 @@ namespace OOX ...@@ -652,7 +652,7 @@ namespace OOX
{ {
CString sResult = _T("<a:effectLst>"); 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 += m_arrEffects[nIndex]->toXML();
sResult += _T("</a:effectLst>"); sResult += _T("</a:effectLst>");
...@@ -735,4 +735,4 @@ namespace OOX ...@@ -735,4 +735,4 @@ namespace OOX
} }
} // OOX } // OOX
} // OOX } // OOX
\ No newline at end of file
...@@ -136,7 +136,7 @@ namespace OOX ...@@ -136,7 +136,7 @@ namespace OOX
void Clear() void Clear()
{ {
for ( int nIndex = 0; nIndex < m_arrEffects.GetSize(); nIndex++ ) for ( int nIndex = 0; nIndex < m_arrEffects.size(); nIndex++ )
{ {
if ( m_arrEffects[nIndex] ) if ( m_arrEffects[nIndex] )
delete m_arrEffects[nIndex]; delete m_arrEffects[nIndex];
...@@ -144,13 +144,13 @@ namespace OOX ...@@ -144,13 +144,13 @@ namespace OOX
m_arrEffects[nIndex] = NULL; m_arrEffects[nIndex] = NULL;
} }
m_arrEffects.RemoveAll(); m_arrEffects.clear();
} }
public: public:
// Childs // Childs
CSimpleArray<WritingElement*> m_arrEffects; std::vector<WritingElement*> m_arrEffects;
}; };
...@@ -3519,4 +3519,4 @@ namespace OOX ...@@ -3519,4 +3519,4 @@ namespace OOX
} // Drawing } // Drawing
} // OOX } // OOX
#endif // OOX_LOGIC_DRAWING_EFFECTS_INCLUDE_H_ #endif // OOX_LOGIC_DRAWING_EFFECTS_INCLUDE_H_
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment