diff --git a/Common/kernel.pro b/Common/kernel.pro index b8e51ebf4f..1c7ed1fc0c 100644 --- a/Common/kernel.pro +++ b/Common/kernel.pro @@ -33,7 +33,6 @@ HEADERS += \ ./../DesktopEditor/graphics/TemporaryCS.h SOURCES += \ - ../OdfFile/Common/logging.cpp \ ./../DesktopEditor/graphics/TemporaryCS.cpp # THREAD diff --git a/OfficeUtils/src/OfficeUtils.cpp b/OfficeUtils/src/OfficeUtils.cpp index 6863bd590e..2634755393 100644 --- a/OfficeUtils/src/OfficeUtils.cpp +++ b/OfficeUtils/src/OfficeUtils.cpp @@ -33,7 +33,6 @@ #include "ZipUtilsCP.h" #include "../../DesktopEditor/common/File.h" #include "../../DesktopEditor/common/Directory.h" -#include "../../OdfFile/Common/logging.h" #include COfficeUtils::COfficeUtils(OnProgressCallback* fCallback) @@ -50,12 +49,10 @@ HRESULT COfficeUtils::ExtractToDirectory(const std::wstring& _zipFile, const std std::wstring zipFile = _zipFile; std::wstring unzipDir = _unzipDir; #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 ) { - _CP_LOG << L"end unzip" << std::endl; - return S_OK; + return S_OK; } else { @@ -69,13 +66,11 @@ HRESULT COfficeUtils::ExtractToDirectory(BYTE* data, size_t len, const std::wstr std::wstring unzipDir = CorrectPathW(_unzipDir); #else std::wstring unzipDir = _unzipDir; -#endif - _CP_LOG << L"start unzip" << std::endl; +#endif - 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 { @@ -93,15 +88,13 @@ HRESULT COfficeUtils::CompressFileOrDirectory(const std::wstring& _name, const s std::wstring name = _name; std::wstring outputFile = _outputFile; #endif - _CP_LOG << L"start zip" << std::endl; HRESULT result = S_FALSE; if(NSDirectory::Exists(name)) { 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 { @@ -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 ) { - _CP_LOG << L"end zip" << std::endl; - result = S_OK; + result = S_OK; } else {