linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64819 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 < min(lIndex, nCount); ++nIndex)
+        for (size_t nIndex = 0; nIndex < std::min(lIndex, nCount); ++nIndex)
 		{
 			if ((*m_parEmptyPictures)[nIndex])
 				++lResult;

ASCPresentationEditor/PPTXWriter/ShapeWriter.h

@@ -385,7 +385,7 @@ namespace NSPresentationEditor
 			m_oWriter.WriteString(std::wstring(L"<p:nvSpPr>"));
 
 			CString strShapeID = _T("");
-			strShapeID.Format(_T("%d", m_lNextShapeID));
+            strShapeID.Format(L"%d", m_lNextShapeID);
 
 			m_oWriter.WriteString(std::wstring(L"<p:cNvPr id=\"") + string2std_string(strShapeID) + L"\"");
 
@@ -604,7 +604,7 @@ namespace NSPresentationEditor
 						{
 							bu = pPF->bulletChar.get();
 						}
-						m_oWriter.WriteString(bu); 
+                        m_oWriter.WriteString(std::wstring(&bu, 1));
                         m_oWriter.WriteString(std::wstring(L"\"/>"));
 					}
 					else