changed CAtlMap to std::map in IFileContainer

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

Common/DocxFormat/Source/Common/SimpleTypes_Word.cpp

@@ -2,7 +2,6 @@
 
 namespace SimpleTypes
 {	
-    //template<EHexColor eDefValue = hexcolorAuto>
     template<>
     EHexColor CHexColor<EHexColor::hexcolorAuto>::FromString (CString &sValue)
     {

Common/DocxFormat/Source/Common/SimpleTypes_Word.h

@@ -2569,51 +2569,9 @@ namespace SimpleTypes
 			m_unB = b;
 		}
 
-        //template <>
-        //class CHighlightColor;
-        //template<EHighlightColor>
-        //class CHighlightColor;
-
         void SetColorByString ();
 
         virtual EHexColor FromString(CString &sValue);
-        /*
-		{
-			if      ( _T("auto") == sValue || _T("none") == sValue )
-                this->m_eValue = hexcolorAuto;
-			else
-			{
-
-
-				//   ,     ,       word  .
-                //CHighlightColor<highlightcolorNone> oHighlightColor(sValue);
-                CHighlightColor<> oHighlightColor(sValue);
-				if(SimpleTypes::highlightcolorNone != oHighlightColor.GetValue())
-				{
-                    this->m_eValue = hexcolorRGB;
-					m_unR = oHighlightColor.Get_R();
-					m_unG = oHighlightColor.Get_G();
-					m_unB = oHighlightColor.Get_B();
-				}
-				else if ( 6 <= sValue.GetLength() )
-				{
-                    this->m_eValue = hexcolorRGB;
-					m_sValue = sValue.Mid( 0, 6 );
-					Parse();
-				}
- 				else if ( 3 == sValue.GetLength() )// a la #339 (Compo 3AP.docx)
-				{
-                    this->m_eValue = hexcolorRGB;
-					m_sValue = sValue;
-					Parse3();
-				}
-				else   this->m_eValue = eDefValue;
-
-			}
-
-            return this->m_eValue;
-		}
-        */
 
 		virtual CString   ToString  () const 
 		{

Common/DocxFormat/Source/DocxFormat/IFileContainer.h

@@ -5,6 +5,7 @@
 #include "RId.h"
 #include "UnknowTypeFile.h"
 #include "IFileBuilder.h"
+#include <map>
 
 namespace OOX 
 {
@@ -30,8 +31,8 @@ namespace OOX
 		}
 	protected:
 
-        CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer;
-        //std::map<CString, smart_ptr<OOX::File>> m_mContainer;
+        //CAtlMap<CString, smart_ptr<OOX::File>> m_mContainer;
+        std::map<CString, smart_ptr<OOX::File>> m_mContainer;
 		size_t                                m_lMaxRid;
 
 	protected: