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

test mht

Browse Source
This commit is contained in:
Svetlana Kulikova
2020-09-04 10:44:57 +03:00
parent 2e776f986a
commit fd1655f00c
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HtmlFile2/test/main.cpp
View File

@ -1,7 +1,6 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "../htmlfile2.h" #include "../htmlfile2.h"
#include "../mhtfile.h"
#include "../../DesktopEditor/common/File.h" #include "../../DesktopEditor/common/File.h"
#include "../../DesktopEditor/common/Directory.h" #include "../../DesktopEditor/common/Directory.h"
#include "../../OfficeUtils/src/OfficeUtils.h" #include "../../OfficeUtils/src/OfficeUtils.h"
@ -47,10 +46,10 @@ int main()
std::wstring sFileName = NSFile::GetFileName(sFile); std::wstring sFileName = NSFile::GetFileName(sFile);
std::wcout << sFileName << std::endl; std::wcout << sFileName << std::endl;
HRESULT nResConvert; HRESULT nResConvert;
CHtmlFile2 oFile;
oFile.SetTmpDirectory(sTmp);
if(bMhtMode) if(bMhtMode)
{ {
CMhtFile oFile;
oFile.SetTmpDirectory(sTmp);
if(!oFile.IsMhtFile(sFile)) if(!oFile.IsMhtFile(sFile))
{ {
nErrorCol++; nErrorCol++;
@ -58,12 +57,11 @@ int main()
std::cout << "This isn't a mht file" << std::endl; std::cout << "This isn't a mht file" << std::endl;
continue; continue;
} }
nResConvert = oFile.Open(sFile, sTmp); nResConvert = oFile.OpenMht(sFile, sTmp);
} }
else else
{ {
CHtmlFile2 oFile;
oFile.SetTmpDirectory(sTmp);
if(!oFile.IsHtmlFile(sFile)) if(!oFile.IsHtmlFile(sFile))
{ {
nErrorCol++; nErrorCol++;
@ -71,7 +69,7 @@ int main()
std::cout << "This isn't a html file" << std::endl; std::cout << "This isn't a html file" << std::endl;
continue; continue;
} }
nResConvert = oFile.Open(sFile, sTmp); nResConvert = oFile.OpenHtml(sFile, sTmp);
} }
if(nResConvert == S_OK) if(nResConvert == S_OK)
{ {
@ -105,18 +103,15 @@ int main()
// Файл, который открываем // Файл, который открываем
std::wstring sFile = NSFile::GetProcessDirectory() + L"/../../../examples/test.mht"; std::wstring sFile = NSFile::GetProcessDirectory() + L"/../../../examples/test.mht";
CHtmlFile2 oFile;
oFile.SetTmpDirectory(sOutputDirectory);
if(bMhtMode) if(bMhtMode)
{ {
CMhtFile oFile; nResConvert = oFile.OpenMht(sFile, sOutputDirectory, &oParams);
oFile.SetTmpDirectory(sOutputDirectory);
nResConvert = oFile.Open(sFile, sOutputDirectory, &oParams);
} }
else else
{ {
CHtmlFile2 oFile; nResConvert = oFile.OpenHtml(sFile, sOutputDirectory, &oParams);
oFile.SetTmpDirectory(sOutputDirectory);
nResConvert = oFile.Open(sFile, sOutputDirectory, &oParams);
} }
if(nResConvert == S_OK) if(nResConvert == S_OK)

1
HtmlFile2/test/test.pro
View File

@ -7,7 +7,6 @@ CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY DEFINES += HTMLFILE2_USE_DYNAMIC_LIBRARY
DEFINES += MHTFILE_USE_DYNAMIC_LIBRARY
SOURCES += main.cpp SOURCES += main.cpp