pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove logs

Browse Source
This commit is contained in:
Oleg Korshul
2025-10-24 19:45:17 +03:00
parent e4825294ed
commit 170cada6e6
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Common/kernel.pro
View File

@ -33,7 +33,6 @@ HEADERS += \
./../DesktopEditor/graphics/TemporaryCS.h ./../DesktopEditor/graphics/TemporaryCS.h
SOURCES += \ SOURCES += \
../OdfFile/Common/logging.cpp \
./../DesktopEditor/graphics/TemporaryCS.cpp ./../DesktopEditor/graphics/TemporaryCS.cpp
# THREAD # THREAD

18
OfficeUtils/src/OfficeUtils.cpp
View File

@ -33,7 +33,6 @@
#include "ZipUtilsCP.h" #include "ZipUtilsCP.h"
#include "../../DesktopEditor/common/File.h" #include "../../DesktopEditor/common/File.h"
#include "../../DesktopEditor/common/Directory.h" #include "../../DesktopEditor/common/Directory.h"
#include "../../OdfFile/Common/logging.h"
#include <sstream> #include <sstream>
COfficeUtils::COfficeUtils(OnProgressCallback* fCallback) COfficeUtils::COfficeUtils(OnProgressCallback* fCallback)
@ -50,12 +49,10 @@ HRESULT COfficeUtils::ExtractToDirectory(const std::wstring& _zipFile, const std
std::wstring zipFile = _zipFile; std::wstring zipFile = _zipFile;
std::wstring unzipDir = _unzipDir; std::wstring unzipDir = _unzipDir;
#endif #endif
_CP_LOG << L"start unzip" << std::endl;
if( ZLibZipUtils::UnzipToDir( zipFile.c_str(), unzipDir.c_str(), m_fCallback, password, ( extract_without_path > 0 ) ? (true) : (false) ) == 0 ) if( ZLibZipUtils::UnzipToDir( zipFile.c_str(), unzipDir.c_str(), m_fCallback, password, ( extract_without_path > 0 ) ? (true) : (false) ) == 0 )
{ {
_CP_LOG << L"end unzip" << std::endl; return S_OK;
return S_OK;
} }
else else
{ {
@ -70,12 +67,10 @@ HRESULT COfficeUtils::ExtractToDirectory(BYTE* data, size_t len, const std::wstr
#else #else
std::wstring unzipDir = _unzipDir; std::wstring unzipDir = _unzipDir;
#endif #endif
_CP_LOG << L"start unzip" << std::endl;
if( ZLibZipUtils::UnzipToDir( data, len, unzipDir.c_str(), m_fCallback, password, ( extract_without_path > 0 ) ? (true) : (false) ) == 0 ) if( ZLibZipUtils::UnzipToDir( data, len, unzipDir.c_str(), m_fCallback, password, ( extract_without_path > 0 ) ? (true) : (false) ) == 0 )
{ {
_CP_LOG << L"end unzip" << std::endl; return S_OK;
return S_OK;
} }
else else
{ {
@ -93,15 +88,13 @@ HRESULT COfficeUtils::CompressFileOrDirectory(const std::wstring& _name, const s
std::wstring name = _name; std::wstring name = _name;
std::wstring outputFile = _outputFile; std::wstring outputFile = _outputFile;
#endif #endif
_CP_LOG << L"start zip" << std::endl;
HRESULT result = S_FALSE; HRESULT result = S_FALSE;
if(NSDirectory::Exists(name)) if(NSDirectory::Exists(name))
{ {
if ( ZLibZipUtils::ZipDir( name.c_str(), outputFile.c_str(), m_fCallback, bSorted, method, level, bDateTime ) == 0 ) if ( ZLibZipUtils::ZipDir( name.c_str(), outputFile.c_str(), m_fCallback, bSorted, method, level, bDateTime ) == 0 )
{ {
_CP_LOG << L"end zip" << std::endl; result = S_OK;
result = S_OK;
} }
else else
{ {
@ -112,8 +105,7 @@ HRESULT COfficeUtils::CompressFileOrDirectory(const std::wstring& _name, const s
{ {
if ( ZLibZipUtils::ZipFile( name.c_str(), outputFile.c_str(), method, level, bDateTime ) == 0 ) if ( ZLibZipUtils::ZipFile( name.c_str(), outputFile.c_str(), method, level, bDateTime ) == 0 )
{ {
_CP_LOG << L"end zip" << std::endl; result = S_OK;
result = S_OK;
} }
else else
{ {