pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-19 23:02:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

change return type

Browse Source
This commit is contained in:
Svetlana Kulikova
2020-07-17 15:13:29 +03:00
parent 6b315996ab
commit 8f6691751a
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Fb2File/Fb2File.cpp
View File

@ -1204,7 +1204,7 @@ void CFb2File::SetTmpDirectory(const std::wstring& sFolder)
// Проверяет, соответствует ли fb2 файл формату
// sPath - путь к файлу fb2, sDirectory - директория, где формируется и создается docx
int CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory, CFb2Params* oParams)
HRESULT CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory, CFb2Params* oParams)
{
if(m_internal->m_sTmpFolder == L"")
SetTmpDirectory(sDirectory + L"/tmp");
@ -1212,7 +1212,7 @@ int CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory, CF
// Копирование шаблона
if(!ExtractTemplate(sTmp))
return FALSE;
return S_FALSE;
// Начало файла
NSStringUtils::CStringBuilder oDocument;
@ -1249,10 +1249,10 @@ int CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory, CF
bNeedContents = oParams->bNeedContents;
NSStringUtils::CStringBuilder oContents;
if(!m_internal->readText(sPath, sMediaDirectory, oContents, oRels, oFootnotes))
return FALSE;
return S_FALSE;
if(!m_internal->m_oLightReader.MoveToStart())
return FALSE;
return S_FALSE;
int nDeath = m_internal->m_oLightReader.GetDepth();
while(m_internal->m_oLightReader.ReadNextSiblingNode(nDeath))
@ -1382,13 +1382,12 @@ int CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory, CF
{
COfficeUtils oZip;
HRESULT oRes = oZip.CompressFileOrDirectory(sTmp, sDirectory + L"/" + NSFile::GetFileName(sPath) + L".docx");
if(oRes == S_FALSE)
return FALSE;
return oRes;
}
else
{
if(!NSDirectory::CopyDirectory(sTmp, sDirectory))
return FALSE;
return S_FALSE;
}
return TRUE;
return S_OK;
}