win build

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

ASCOfficePPTFile/PPTFormatLib/Reader/SlideInfo.h

@@ -100,7 +100,7 @@ public:
 		if (lIndex > nCount)
 			return lIndex;
 
-        for (size_t nIndex = 0; nIndex < std::min(lIndex, nCount); ++nIndex)
+        for (size_t nIndex = 0; nIndex < (std::min)(lIndex, (DWORD)nCount); ++nIndex)
 		{
 			if ((*m_parEmptyPictures)[nIndex])
 				++lResult;

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -341,7 +341,7 @@ namespace NSBinPptxRW
 	CString CImageManager2::DownloadImageExec(const CString& strFile)
 	{
 #ifndef DISABLE_FILE_DOWNLOADER
-        CFileDownloader oDownloader(strFile, false);
+        CFileDownloader oDownloader(string2std_string(strFile), false);
 		oDownloader.Start( 1 );
 		while ( oDownloader.IsRunned() )
 		{
@@ -350,7 +350,7 @@ namespace NSBinPptxRW
 
 		if ( oDownloader.IsFileDownloaded() )
 		{
-			return oDownloader.GetFilePath();
+            return std_string2string(oDownloader.GetFilePath());
 		}
 #endif
 		return _T("");

ASCOfficePPTXFile/Editor/imagemanager.h

@@ -293,7 +293,7 @@ namespace NSShapeImageGen
 
 #ifndef DISABLE_FILE_DOWNLOADER
 
-                CFileDownloader oDownloader(strFile1, true);
+                CFileDownloader oDownloader(string2std_string(strFile1), true);
 				oDownloader.Start( 1 );
 				while ( oDownloader.IsRunned() )
 				{
@@ -301,7 +301,7 @@ namespace NSShapeImageGen
 				}
 
 				if ( oDownloader.IsFileDownloaded() )
-					strDownload = oDownloader.GetFilePath();
+                    strDownload = std_string2string(oDownloader.GetFilePath());
 
 #endif