pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux build

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59096 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2014-10-22 08:45:03 +00:00
committed by Alexander Trofimov
parent f34d2bd961
commit ace4c6efeb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp
View File

@ -86,8 +86,8 @@ HRESULT CPPTXFile::LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptio
if(SHFileOperationW(&shfos) != 0)
return S_FALSE;
*/
if(!m_fCallbackExtract(m_pCallbackArg, CString(sSrcFileName), localTempDir))
CString srcFileName = sSrcFileName;
if(!m_fCallbackExtract(m_pCallbackArg, srcFileName , localTempDir))
return S_FALSE;
RELEASEOBJECT(m_pFolder);
@ -127,7 +127,9 @@ HRESULT CPPTXFile::SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions
oPath.m_strFilename = CString(sSrcPath);
m_pFolder->write(oPath);
return m_fCallbackCompress(m_pCallbackArg, CString(sSrcPath), CString(sDstFileName)) ? S_OK : S_FALSE;
CString srcFilePath = sSrcPath;
CString dstFileName = sDstFileName;
return m_fCallbackCompress(m_pCallbackArg, srcFilePath, dstFileName) ? S_OK : S_FALSE;
}
HRESULT CPPTXFile::get_TempDirectory(BSTR* pVal)
{
@ -230,7 +232,8 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput)
FileSystem::Directory::CreateDirectory(m_strTempDir); // security options ???
if(!m_fCallbackExtract(m_pCallbackArg, CString(bsInput), m_strTempDir))
CString strBsInput = bsInput;
if(!m_fCallbackExtract(m_pCallbackArg, strBsInput , m_strTempDir))
return S_FALSE;
RELEASEOBJECT(m_pFolder);
@ -366,7 +369,8 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(BSTR bsInput, BSTR bsOutput)
oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, m_strFolderThemes);
RELEASEARRAYOBJECTS(pSrcBuffer);
HRESULT hRes = m_fCallbackCompress(m_pCallbackArg, m_strTempDir, CString(bsOutput)) ? S_OK : S_FALSE;
CString strBsOutput = bsOutput;
HRESULT hRes = m_fCallbackCompress(m_pCallbackArg, m_strTempDir, strBsOutput) ? S_OK : S_FALSE;
// <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
RemoveDirOrFile(m_strTempDir);