PPtFile win64

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

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -29,7 +29,7 @@ bool COfficePPTFile::OpenFile(std::wstring sFileName)
 	
 	pStgFrom->open(false,false);
 
-	m_pReader = new CPPTFileReader(pStgFrom, m_strTempDirectory);
+	m_pReader = new CPPTFileReader(pStgFrom, std_string2string(m_strTempDirectory));
     ((CPPTFileReader*)m_pReader)->m_oDocumentInfo.m_strFileDirectory = GetDirectory(sFileName.c_str());
 	
 	if	(!((CPPTFileReader*)m_pReader)->IsPowerPoint()) 

ASCOfficePPTFile/Win32/OfficePPTFile.h

@@ -85,12 +85,12 @@ public:
 		if (NULL == pbstrDir)
 			return S_FALSE;
 
-		*pbstrDir = PPTFile.get_TempDirectory().AllocSysString();
+		*pbstrDir = SysAllocString(PPTFile.get_TempDirectory().c_str());
 		return S_OK;
 	}
 	STDMETHOD(put_TempDirectory)(BSTR bstrDir)
 	{
-		PPTFile.put_TempDirectory((CStringW)bstrDir);
+		PPTFile.put_TempDirectory((std::wstring)bstrDir);
 		return S_OK;
 	}
 	STDMETHOD(Is_PPTFile)(BSTR fileName, VARIANT_BOOL* Result)
@@ -103,7 +103,7 @@ public:
 	{
 		CSynchAccess oSynchAccess(m_hSynchMutex);
 
-		return PPTFile.LoadFromFile(CString(sSrcFileName), CString(sDstPath), CString(sXMLOptions));
+		return PPTFile.LoadFromFile(std::wstring(sSrcFileName), std::wstring(sDstPath));
 	}
 	STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions)
 	{

ASCOfficePPTFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//264
-#define INTVER 1,0,1,264
-#define STRVER "1,0,1,264\0"
+//269
+#define INTVER 1,0,1,269
+#define STRVER "1,0,1,269\0"