From 53d4305f60fcc2acbb96409dcd7b1e0374bc6f78 Mon Sep 17 00:00:00 2001
From: "Elen.Subbotina" <Elen.Subbotina@onlyoffice.com>
Date: Wed, 22 Oct 2014 11:24:38 +0000
Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=8B=20=D0=B4=D0=BE=D0=B3=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=83=20(win32)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59106 954022d7-b5bf-4e40-9824-e11837661b57
---
 ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp         | 5 ++++-
 ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj                | 4 ----
 Common/DocxFormat/Projects/DocxFormat2005.vcproj           | 4 ----
 .../Source/SystemUtility/FileSystem/Directory.cpp          | 7 +++++++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp b/ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp
index af361c4ddd..afb342025a 100644
--- a/ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp
+++ b/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;
diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
index 2408c24e77..0249b7bee8 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
@@ -2823,10 +2823,6 @@
 					<Filter
 						Name="System"
 						>
-						<File
-							RelativePath="..\.\Directory.cpp"
-							>
-						</File>
 						<File
 							RelativePath="..\.\Directory.h"
 							>
diff --git a/Common/DocxFormat/Projects/DocxFormat2005.vcproj b/Common/DocxFormat/Projects/DocxFormat2005.vcproj
index ce38d2077a..09f6149eb5 100644
--- a/Common/DocxFormat/Projects/DocxFormat2005.vcproj
+++ b/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"
 			>
diff --git a/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.cpp b/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.cpp
index b16703dfb9..25b843f844 100644
--- a/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.cpp
+++ b/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);
+	}
 
 }