Commit dd6ac185 authored by ElenaSubbotina's avatar ElenaSubbotina

fix - remove tmp pptx folder

parent 9825b6e3
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
QT -= core QT -= core
QT -= gui QT -= gui
VERSION = 2.0.3.441 VERSION = 2.0.3.444
DEFINES += INTVER=$$VERSION DEFINES += INTVER=$$VERSION
TARGET = x2t TARGET = x2t
......
...@@ -366,9 +366,9 @@ namespace NExtractTools ...@@ -366,9 +366,9 @@ namespace NExtractTools
else return AVS_FILEUTILS_ERROR_CONVERT; else return AVS_FILEUTILS_ERROR_CONVERT;
} }
return pptx_dir2pptt_bin(sTempUnpackedPPTX, sTo, params); return pptx_dir2pptt_bin(sTempUnpackedPPTX, sTo, sTemp, params);
} }
int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params) int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{ {
// convert unzipped pptx to unzipped pptt // convert unzipped pptx to unzipped pptt
CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL); CPPTXFile *pptx_file = new CPPTXFile(NULL, NULL, NULL, NULL);
...@@ -377,6 +377,7 @@ namespace NExtractTools ...@@ -377,6 +377,7 @@ namespace NExtractTools
if (pptx_file) if (pptx_file)
{ {
pptx_file->put_TempDirectory(sTemp);
pptx_file->SetFontDir (params.getFontPath()); pptx_file->SetFontDir (params.getFontPath());
nRes = (S_OK == pptx_file->OpenFileToPPTY (sFrom, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; nRes = (S_OK == pptx_file->OpenFileToPPTY (sFrom, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT;
...@@ -2192,7 +2193,7 @@ namespace NExtractTools ...@@ -2192,7 +2193,7 @@ namespace NExtractTools
} }
else if(AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION == nFormatTo) else if(AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION == nFormatTo)
{ {
nRes = pptx_dir2pptt_bin(sFrom, sTo, params); nRes = pptx_dir2pptt_bin(sFrom, sTo, sTemp, params);
} }
else else
{ {
...@@ -2200,7 +2201,7 @@ namespace NExtractTools ...@@ -2200,7 +2201,7 @@ namespace NExtractTools
NSDirectory::CreateDirectory(sPpttDir); NSDirectory::CreateDirectory(sPpttDir);
std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin"); std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin");
nRes = pptx_dir2pptt_bin(sFrom, sTFile, params); nRes = pptx_dir2pptt_bin(sFrom, sTFile, sTemp, params);
if(SUCCEEDED_X2T(nRes)) if(SUCCEEDED_X2T(nRes))
{ {
nRes = fromPpttBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); nRes = fromPpttBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params);
......
...@@ -63,7 +63,7 @@ namespace NExtractTools ...@@ -63,7 +63,7 @@ namespace NExtractTools
int xlst2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params); int xlst2xlsx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
int pptx2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params); int pptx2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, InputParams& params); int pptx_dir2pptt_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
int pptx2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params); int pptx2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params);
int pptt_bin2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params); int pptt_bin2pptx (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
int pptt_bin2pptx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params); int pptt_bin2pptx_dir (const std::wstring &sFrom, const std::wstring &sToResult, const std::wstring &sTo, bool bFromChanges, const std::wstring &sThemeDir, InputParams& params);
......
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