Commit ace4c6ef authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59096 954022d7-b5bf-4e40-9824-e11837661b57
parent f34d2bd9
...@@ -86,8 +86,8 @@ HRESULT CPPTXFile::LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptio ...@@ -86,8 +86,8 @@ HRESULT CPPTXFile::LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptio
if(SHFileOperationW(&shfos) != 0) if(SHFileOperationW(&shfos) != 0)
return S_FALSE; return S_FALSE;
*/ */
CString srcFileName = sSrcFileName;
if(!m_fCallbackExtract(m_pCallbackArg, CString(sSrcFileName), localTempDir)) if(!m_fCallbackExtract(m_pCallbackArg, srcFileName , localTempDir))
return S_FALSE; return S_FALSE;
RELEASEOBJECT(m_pFolder); RELEASEOBJECT(m_pFolder);
...@@ -127,7 +127,9 @@ HRESULT CPPTXFile::SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions ...@@ -127,7 +127,9 @@ HRESULT CPPTXFile::SaveToFile(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions
oPath.m_strFilename = CString(sSrcPath); oPath.m_strFilename = CString(sSrcPath);
m_pFolder->write(oPath); 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) HRESULT CPPTXFile::get_TempDirectory(BSTR* pVal)
{ {
...@@ -230,7 +232,8 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput) ...@@ -230,7 +232,8 @@ HRESULT CPPTXFile::OpenFileToPPTY(BSTR bsInput, BSTR bsOutput)
FileSystem::Directory::CreateDirectory(m_strTempDir); // security options ??? 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; return S_FALSE;
RELEASEOBJECT(m_pFolder); RELEASEOBJECT(m_pFolder);
...@@ -366,7 +369,8 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(BSTR bsInput, BSTR bsOutput) ...@@ -366,7 +369,8 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(BSTR bsInput, BSTR bsOutput)
oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, m_strFolderThemes); oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, m_strFolderThemes);
RELEASEARRAYOBJECTS(pSrcBuffer); 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;
// //
RemoveDirOrFile(m_strTempDir); RemoveDirOrFile(m_strTempDir);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment