Skip to content

O
onlyoffice_core
Commit 9d14b8bf authored by Boris Kocherov's avatar Boris Kocherov
Browse files
Options

use body.txt instead of Editor.bin

parent 562f5a9a
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
X2tConverter/src/ASCConverters.cpp
View file @ 9d14b8bf
......@@ -144,7 +144,7 @@ namespace NExtractTools
{
// Extract docx to temp directory
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -214,7 +214,7 @@ namespace NExtractTools
{
// Extract docx to temp directory
std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedDOCT);
......@@ -517,7 +517,7 @@ namespace NExtractTools
{
// Extract xlsx to temp directory
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultXlstDir);
......@@ -585,7 +585,7 @@ namespace NExtractTools
{
// Extract xlsx to temp directory
std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedXLST);
......@@ -864,7 +864,7 @@ namespace NExtractTools
int pptx2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + _T("pptt_unpacked");
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultPpttDir);
......@@ -929,7 +929,7 @@ namespace NExtractTools
{
// unzip pptt to temp folder
std::wstring sTempUnpackedPPTT = sTemp + FILE_SEPARATOR_STR + _T("pptt_unpacked");
std::wstring sTempPpttFileEditor = sTempUnpackedPPTT + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempPpttFileEditor = sTempUnpackedPPTT + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedPPTT);
......@@ -959,7 +959,7 @@ namespace NExtractTools
{
std::wstring sCSV = sFrom;
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultXlstDir);
......@@ -985,7 +985,7 @@ namespace NExtractTools
std::wstring sCSV = sFrom;
std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked");
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedXLSX);
NSDirectory::CreateDirectory(sResultXlstDir);
......@@ -1028,7 +1028,7 @@ namespace NExtractTools
{
std::wstring sCSV = sTo;
std::wstring sTempUnpackedXLST = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempXlstFileEditor = sTempUnpackedXLST + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedXLST);
......@@ -1054,7 +1054,7 @@ namespace NExtractTools
std::wstring sCSV = sTo;
std::wstring sTempUnpackedXLSX = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked");
std::wstring sResultXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultXlstFileEditor = sResultXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedXLSX);
NSDirectory::CreateDirectory(sResultXlstDir);
......@@ -1709,7 +1709,7 @@ namespace NExtractTools
int ppt2pptt (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
std::wstring sResultPpttDir = sTemp + FILE_SEPARATOR_STR + _T("pptt_unpacked");
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempPpttFileEditor = sResultPpttDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultPpttDir);
......@@ -1829,7 +1829,7 @@ namespace NExtractTools
{
// Extract docx to temp directory
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -2001,7 +2001,7 @@ namespace NExtractTools
{
// Extract docx to temp directory
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -2068,7 +2068,7 @@ namespace NExtractTools
{
// Extract docx to temp directory
std::wstring sTempUnpackedDOCT = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTempDoctFileEditor = sTempUnpackedDOCT + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sTempUnpackedDOCT);
......@@ -2151,7 +2151,7 @@ namespace NExtractTools
int txt2doct (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params)
{
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -2200,7 +2200,7 @@ namespace NExtractTools
int odf2oot(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -2270,7 +2270,7 @@ namespace NExtractTools
int odf_flat2oot(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -2396,7 +2396,7 @@ namespace NExtractTools
int mscrypt2oot (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
std::wstring sResultOotDir = sTemp + FILE_SEPARATOR_STR + _T("oot_unpacked");
std::wstring sResultOotFileEditor = sResultOotDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultOotFileEditor = sResultOotDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultOotDir);
......@@ -2635,7 +2635,7 @@ namespace NExtractTools
{
std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
NSDirectory::CreateDirectory(sDoctDir);
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
nRes = docx_dir2doct_bin(sFrom, sTFile, params);
......@@ -2717,7 +2717,7 @@ namespace NExtractTools
{
std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
NSDirectory::CreateDirectory(sDoctDir);
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML == nFormatFrom)
nRes = html2doct_dir(sFrom, sDoctDir, sTemp, params);
......@@ -2840,7 +2840,7 @@ namespace NExtractTools
{
std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
NSDirectory::CreateDirectory(sXlstDir);
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
if(AVS_OFFICESTUDIO_FILE_SPREADSHEET_CSV == nFormatTo)
nRes = xlsx_dir2xlst_bin(sFrom, sTFile, params, false, sXlsxFile);
else
......@@ -2919,7 +2919,7 @@ namespace NExtractTools
{
std::wstring sXlstDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
NSDirectory::CreateDirectory(sXlstDir);
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sXlstDir + FILE_SEPARATOR_STR + _T("body.txt");
nRes = csv2xlst_bin(sFrom, sTFile, params);
if(SUCCEEDED_X2T(nRes))
{
......@@ -3023,7 +3023,7 @@ namespace NExtractTools
{
std::wstring sPpttDir = sTemp + FILE_SEPARATOR_STR + _T("pptt_unpacked");
NSDirectory::CreateDirectory(sPpttDir);
std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sPpttDir + FILE_SEPARATOR_STR + _T("body.txt");
nRes = pptx_dir2pptt_bin(sFrom, sTFile, sTemp, params);
if(SUCCEEDED_X2T(nRes))
......@@ -3166,7 +3166,7 @@ namespace NExtractTools
{
std::wstring sTDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
NSDirectory::CreateDirectory(sTDir);
std::wstring sTFile = sTDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sTFile = sTDir + FILE_SEPARATOR_STR + _T("body.txt");
nRes = zip2dir(sFrom, sTDir);
if(SUCCEEDED_X2T(nRes))
{
......@@ -3280,7 +3280,7 @@ namespace NExtractTools
{
// Extract xlsx to temp directory
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -3328,7 +3328,7 @@ namespace NExtractTools
int html2doct(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......@@ -3344,7 +3344,7 @@ namespace NExtractTools
int html2docx(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params)
{
std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin");
std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("body.txt");
NSDirectory::CreateDirectory(sResultDoctDir);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7