Compare commits

...

2 Commits

Author SHA1 Message Date
b3ee693890 fix bug 34011 2017-02-08 19:35:45 +03:00
8c2e1738ea fix bug #33752 after refactoring 2017-02-07 12:42:46 +03:00
3 changed files with 6 additions and 7 deletions

View File

@ -339,9 +339,9 @@ public:
if(ThemeColor.bColor)
sShd += L" w:themeFill=\"" + ThemeColor.ToStringColor() + L"\"";
if(ThemeColor.bTint)
sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringColor() + L"\"";
sShd += L" w:themeFillTint=\"" + ThemeColor.ToStringTint() + L"\"";
if(ThemeColor.bShade)
sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringColor() + L"\"";
sShd += L" w:themeFillShade=\"" + ThemeColor.ToStringShade() + L"\"";
}
sShd += L"/>";
}

View File

@ -173,9 +173,8 @@ namespace OOX
bool CPath::FileInDirectoryCorrect()
{
std::wstring fileDirectory = GetDirectory(false);
std::wstring lowerFileName = m_strFilename;
XmlUtils::GetLower(lowerFileName);
std::wstring lowerFileName = XmlUtils::GetLower(m_strFilename);
CArray<std::wstring> trueArray;
@ -183,8 +182,7 @@ namespace OOX
for (int i = 0; i < trueArray.GetCount(); i++)
{
std::wstring lowerTest = trueArray[i];
XmlUtils::GetLower(lowerTest);
std::wstring lowerTest = XmlUtils::GetLower(trueArray[i]);
if (lowerTest == lowerFileName)
{

View File

@ -82,7 +82,8 @@ namespace XmlUtils
Clear();
NSFile::CFileBinary oFile;
oFile.OpenFile(sFilePath);
if (oFile.OpenFile(sFilePath) == false) return false;
m_lStreamLen = (LONG)oFile.GetFileSize();
m_pStream = new BYTE[m_lStreamLen];
DWORD dwRead = 0;