Commit 8c2e1738 authored by ElenaSubbotina's avatar ElenaSubbotina

fix bug #33752 after refactoring

parent bf33aed8
...@@ -173,9 +173,8 @@ namespace OOX ...@@ -173,9 +173,8 @@ namespace OOX
bool CPath::FileInDirectoryCorrect() bool CPath::FileInDirectoryCorrect()
{ {
std::wstring fileDirectory = GetDirectory(false); std::wstring fileDirectory = GetDirectory(false);
std::wstring lowerFileName = m_strFilename;
XmlUtils::GetLower(lowerFileName); std::wstring lowerFileName = XmlUtils::GetLower(m_strFilename);
CArray<std::wstring> trueArray; CArray<std::wstring> trueArray;
...@@ -183,8 +182,7 @@ namespace OOX ...@@ -183,8 +182,7 @@ namespace OOX
for (int i = 0; i < trueArray.GetCount(); i++) for (int i = 0; i < trueArray.GetCount(); i++)
{ {
std::wstring lowerTest = trueArray[i]; std::wstring lowerTest = XmlUtils::GetLower(trueArray[i]);
XmlUtils::GetLower(lowerTest);
if (lowerTest == lowerFileName) if (lowerTest == lowerFileName)
{ {
......
...@@ -82,7 +82,8 @@ namespace XmlUtils ...@@ -82,7 +82,8 @@ namespace XmlUtils
Clear(); Clear();
NSFile::CFileBinary oFile; NSFile::CFileBinary oFile;
oFile.OpenFile(sFilePath); if (oFile.OpenFile(sFilePath) == false) return false;
m_lStreamLen = (LONG)oFile.GetFileSize(); m_lStreamLen = (LONG)oFile.GetFileSize();
m_pStream = new BYTE[m_lStreamLen]; m_pStream = new BYTE[m_lStreamLen];
DWORD dwRead = 0; DWORD dwRead = 0;
......
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