CAtlMap -> std::map

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

ASCOfficePPTXFile/PPTXFormat/DocxFormat/ContentTypes/File.h

@@ -11,7 +11,7 @@ namespace PPTX
 {
 	namespace ContentTypes
 	{
-		static const OOX::CPath s_filename = L"[Content_Types].xml";
+        static const OOX::CPath s_filename (_T("[Content_Types].xml"));
 
 		class File
 		{

ASCOfficePPTXFile/PPTXFormat/DocxFormat/IFileContainer.h

@@ -28,7 +28,8 @@ namespace PPTX
 		{
 		}
 	protected:
-		CAtlMap<CString, smart_ptr<PPTX::File>>	m_container;
+        //CAtlMap<CString, smart_ptr<PPTX::File>>	m_container;
+        std::map<CString, smart_ptr<PPTX::File>>	m_container;
 		size_t m_lMaxRid;
 
 	protected:

ASCOfficePPTXFile/PPTXFormat/DocxFormat/RId.h

@@ -37,11 +37,13 @@ namespace PPTX
 			m_id = rid;			
 			return *this;
 		}
+#ifdef _WIN32
 		const RId& operator= (const BSTR& rid)
 		{
 			m_id = (CString)rid;	
 			return *this;
 		}
+#endif
 		const RId& operator= (const RId& oSrc)
 		{
 			m_id = oSrc.m_id;