Commit 6f2eef11 authored by ElenaSubbotina's avatar ElenaSubbotina

..

parent 9a8d3edb
...@@ -73,9 +73,9 @@ namespace PPTX ...@@ -73,9 +73,9 @@ namespace PPTX
{ {
directory = directory.substr(0, pos_ppt - 1); //root directory directory = directory.substr(0, pos_ppt - 1); //root directory
} }
CArray<std::wstring> arrFiles = NSDirectory::GetFiles(directory, true); std::vector<std::wstring> arrFiles = NSDirectory::GetFiles(directory, true);
for (int i = 0 ; i < arrFiles.GetCount(); i++) for (size_t i = 0 ; i < arrFiles.size(); i++)
{ {
if (std::wstring::npos != arrFiles[i].find(filename)) if (std::wstring::npos != arrFiles[i].find(filename))
{ {
......
...@@ -276,10 +276,12 @@ namespace NExtractTools ...@@ -276,10 +276,12 @@ namespace NExtractTools
if (NSDirectory::Exists(sChangesDir)) if (NSDirectory::Exists(sChangesDir))
{ {
std::vector<std::wstring> aChangesFiles; std::vector<std::wstring> aChangesFiles;
CArray<std::wstring> oArray; std::vector<std::wstring> oArray;
NSDirectory::GetFiles2(sChangesDir, oArray, false);
std::vector<std::wstring> aFiles; std::vector<std::wstring> aFiles;
for(int i = 0; i < oArray.GetCount(); ++i)
NSDirectory::GetFiles2(sChangesDir, oArray, false);
for(size_t i = 0; i < oArray.size(); ++i)
{ {
aChangesFiles.push_back(oArray[i]); aChangesFiles.push_back(oArray[i]);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment