вы догонку (win32)

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

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -365,8 +365,11 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(BSTR bsInput, BSTR bsOutput)
 	BYTE* pSrcBuffer = new BYTE[lFileSize];
 	oFileBinary.ReadFile(pSrcBuffer, (DWORD)lFileSize);
 	oFileBinary.CloseFile();
-    CString srcFolder = FileSystem::Directory::GetFolderPath((CString)bsInput);
+	
+	CString strBsInput = bsInput;
+    CString srcFolder = FileSystem::Directory::GetFolderPath(strBsInput);
 	oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, m_strFolderThemes);
+	
 	RELEASEARRAYOBJECTS(pSrcBuffer);
 
     CString strBsOutput = bsOutput;

ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj

@@ -2823,10 +2823,6 @@
 					<Filter
 						Name="System"
 						>
-						<File
-							RelativePath="..\.\Directory.cpp"
-							>
-						</File>
 						<File
 							RelativePath="..\.\Directory.h"
 							>

Common/DocxFormat/Projects/DocxFormat2005.vcproj

@@ -1437,10 +1437,6 @@
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\Source\SystemUtility\FileSystem\Directory.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\Source\DocxFormat\Docx.cpp"
 			>

Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.cpp

@@ -118,5 +118,12 @@ namespace FileSystem
 
         return filesCount;
     }
+	CString Directory::GetFolderPath(const CString& strFolderPath)
+	{
+        int n1 = strFolderPath.ReverseFind('\\');
+        if (n1 < 0 )
+            return _T("");
+        return strFolderPath.Mid(0,n1);
+	}
 
 }