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

Fix bug

Browse Source
This commit is contained in:
Alexey
2024-02-07 11:51:34 +03:00
parent 6b29728c46
commit b81fc6b3c7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DesktopEditor/common/Directory.cpp
View File

@ -586,11 +586,7 @@ namespace NSDirectory
int GetFilesCount(const std::wstring& path, const bool& recursive)
{
std::vector<std::wstring> arrFiles = NSDirectory::GetFiles(path, recursive);
#if defined(_WIN32) || defined (_WIN64)
return (int)arrFiles.size();
#endif
return (int)arrFiles.size() + 1;
// ???
}
bool PathIsDirectory(const std::wstring& pathName)
{

5
Test/Applications/x2tTester/x2tTester.cpp
View File

@ -465,6 +465,7 @@ void Cx2tTester::Start()
m_outputDirectory = CorrectPathW(m_outputDirectory);
m_errorsXmlDirectory = CorrectPathW(m_errorsXmlDirectory);
m_troughConversionDirectory = CorrectPathW(m_troughConversionDirectory);
m_tempDirectory = CorrectPathW(m_tempDirectory);
// setup & clear output folder
if(NSDirectory::Exists(m_outputDirectory))
@ -534,7 +535,7 @@ void Cx2tTester::Start()
if(NSDirectory::Exists(m_tempDirectory))
NSDirectory::DeleteDirectory(m_tempDirectory);
NSDirectory::CreateDirectories(CorrectPathW(m_tempDirectory));
NSDirectory::CreateDirectories(m_tempDirectory);
auto copy_inputDirectory = m_inputDirectory;
auto copy_outputDirectory = m_outputDirectory;
@ -644,7 +645,7 @@ void Cx2tTester::Convert(const std::vector<std::wstring>& files, bool bNoDirecto
// setup & clear output subfolder
if (!NSDirectory::Exists(output_files_directory))
NSDirectory::CreateDirectories(CorrectPathW(output_files_directory));
NSDirectory::CreateDirectories(output_files_directory);
std::wstring csvTxtEncodingS = m_defaultCsvTxtEndcoding;
std::wstring csvDelimiter = m_defaultCsvDelimiter;