CAtlMap -> std::map

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

Common/DocxFormat/Source/DocxFormat/ContentTypes.h

@@ -60,7 +60,6 @@ namespace OOX
 
 		private:
             std::map <CString, CString> m_mTable;
-            //CAtlMap<CString, CString> m_mTable;
 		};
 		class CDefault : public WritingElement
 		{
@@ -260,14 +259,6 @@ namespace OOX
             {
                 sXml += it->second.toXML();
             }
-/*
-			POSITION pos = m_arrOverride.GetStartPosition();
-			while ( NULL != pos )
-			{
-				const CAtlMap<CString, ContentTypes::COverride>::CPair* pPair = m_arrOverride.GetNext( pos );
-				sXml += pPair->m_value.toXML();
-			}
-            */
 
 			sXml += _T("</Types>");
 
@@ -340,7 +331,6 @@ namespace OOX
 	public:
 
 		std::vector<ContentTypes::CDefault*>		m_arrDefault;
-        //CAtlMap<CString, ContentTypes::COverride>	m_arrOverride;
         std::map<CString, ContentTypes::COverride>	m_arrOverride;
 	};
 } // namespace OOX

Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h

@@ -6,6 +6,8 @@
 #include "../../DocxFormat/Logic/Vml.h"
 #include "../SharedStrings/Si.h"
 
+#include <map>
+
 namespace OOX
 {
 	namespace Spreadsheet
@@ -419,18 +421,15 @@ namespace OOX
 			}
 			virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
 			{
-				if(NULL != m_mapComments && m_mapComments->GetCount() > 0)
+				if(NULL != m_mapComments && m_mapComments->size() > 0)
 				{
 					XmlUtils::CStringWriter sXml;
 					sXml.WriteString(_T("<xml xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:x=\"urn:schemas-microsoft-com:office:excel\"><o:shapelayout v:ext=\"edit\"><o:idmap v:ext=\"edit\" data=\"1\"/></o:shapelayout><v:shapetype id=\"_x0000_t202\" coordsize=\"21600,21600\" o:spt=\"202\" path=\"m,l,21600r21600,l21600,xe\"><v:stroke joinstyle=\"miter\"/><v:path gradientshapeok=\"t\" o:connecttype=\"rect\"/></v:shapetype>"));
 					int nIndex = 1025;
-					POSITION pos = m_mapComments->GetStartPosition();
-					while ( NULL != pos )
+
+					for (std::map<CString, OOX::Spreadsheet::CCommentItem*>::const_iterator it = m_mapComments->begin(); it != m_mapComments->end(); ++it)
 					{
-						CAtlMap<CString, OOX::Spreadsheet::CCommentItem*>::CPair* pPair = m_mapComments->GetNext( pos );
-						if(NULL != pPair)
-						{
-							OOX::Spreadsheet::CCommentItem* comment = pPair->m_value;
+							OOX::Spreadsheet::CCommentItem* comment = it->second;
 							CString sStyle;
 							if(comment->m_dLeftMM.IsInit())
 							{
@@ -475,7 +474,6 @@ namespace OOX
 							CString sShape;sShape.Format(_T("<v:shape id=\"_x0000_s%d\" type=\"#_x0000_t202\" style='position:absolute;%sz-index:4;visibility:hidden' %s fillcolor=\"#ffffe1\" o:insetmode=\"auto\"><v:fill color2=\"#ffffe1\"/><v:shadow on=\"t\" color=\"black\" obscured=\"t\"/><v:path o:connecttype=\"none\"/><v:textbox style='mso-direction-alt:auto'><div style='text-align:left'></div></v:textbox>%s</v:shape>"), nIndex, sStyle, sGfxdata, sClientData);
 							sXml.WriteString(sShape);
 							nIndex++;
-						}
 					}
 					sXml.WriteString(_T("</xml>"));
 
@@ -520,7 +518,7 @@ namespace OOX
 
 		public:
 			std::vector<OOX::Vml::CShape *>         m_arrItems;
-			CAtlMap<CString, OOX::Spreadsheet::CCommentItem*>* m_mapComments;
+			std::map<CString, OOX::Spreadsheet::CCommentItem*>* m_mapComments;
 		};
 	} //Spreadsheet
 } // namespace OOX

Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h

@@ -158,7 +158,7 @@ namespace OOX
 								if(NULL != pSi)
 									pCommentItem->m_oText.reset(pSi);
 								CString sNewId;sNewId.Format(_T("%d-%d"), pCommentItem->m_nRow.get(), pCommentItem->m_nCol.get());
-								m_mapComments.SetAt(sNewId, pCommentItem);
+								m_mapComments [sNewId] = pCommentItem;
 							}
 						}
 					}
@@ -179,10 +179,11 @@ namespace OOX
 								int nRow = pClientData->m_oRow->GetValue();
 								int nCol = pClientData->m_oColumn->GetValue();
 								CString sId;sId.Format(_T("%d-%d"), nRow, nCol);
-								CAtlMap<CString, CCommentItem*>::CPair* pPair = m_mapComments.Lookup(sId);
-								if(NULL != pPair)
+
+								std::map<CString, CCommentItem*>::const_iterator pPair = m_mapComments.find(sId);
+								if(pPair != m_mapComments.end())
 								{
-									CCommentItem* pCommentItem = pPair->m_value;
+									CCommentItem* pCommentItem = pPair->second;
 									if(pShape->m_oGfxData.IsInit())
 										pCommentItem->m_sGfxdata = pShape->m_oGfxData.get2();
 									if(pClientData->m_oAnchor.IsInit())
@@ -407,13 +408,12 @@ namespace OOX
 		private:
 			void ClearItems()
 			{
-				POSITION pos = m_mapComments.GetStartPosition();
-				while ( NULL != pos )
+				for (std::map<CString, CCommentItem*>::const_iterator it = m_mapComments.begin(); it != m_mapComments.end(); ++it)
 				{
-					CAtlMap<CString, CCommentItem*>::CPair* pPair = m_mapComments.GetNext( pos );
-					delete pPair->m_value;
+					delete it->second;
 				}
-				m_mapComments.RemoveAll();
+
+				m_mapComments.clear();
 
 				// delete Conditional Formatting
 				m_arrConditionalFormatting.clear();
@@ -436,7 +436,7 @@ namespace OOX
 			nullable<OOX::Spreadsheet::CAutofilter> m_oAutofilter;
 			nullable<OOX::Spreadsheet::CTableParts> m_oTableParts;
 			nullable<OOX::Spreadsheet::CLegacyDrawingWorksheet> m_oLegacyDrawingWorksheet;
-			CAtlMap<CString, CCommentItem*> m_mapComments;
+			std::map<CString, CCommentItem*> m_mapComments;
 			std::vector<OOX::Spreadsheet::CConditionalFormatting*> m_arrConditionalFormatting;
 			nullable<OOX::Spreadsheet::CSheetPr> m_oSheetPr;
 		};