diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp index f553baf0e5..5b6d4d310a 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp @@ -432,7 +432,7 @@ CFRecordPtr BinaryStreamCacheReader::getNextRecord(const CFRecordType::TypeId de { CFRecordType::TypeString rec_name = records_cache.front()->getTypeString(); - Log::warning(rec_name); + //Log::warning(rec_name); /*if (desirable_type == rt_MsoDrawingGroup) // объединяем rt_MsoDrawingGroup + rt_Continue в один блок { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BorderFillInfo.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BorderFillInfo.cpp index 133b3edd5b..c1b4690a72 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BorderFillInfo.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BorderFillInfo.cpp @@ -57,8 +57,11 @@ namespace XLS boost::hash_combine(seed, val.backFillInfo_); boost::hash_combine(seed, val.foreFillInfo_); - boost::hash_combine(seed, val.icvFore); - boost::hash_combine(seed, val.icvBack); + if (!val.foreFillInfo_.enabled) + boost::hash_combine(seed, val.icvFore); + if (!val.backFillInfo_.enabled) + boost::hash_combine(seed, val.icvBack); + boost::hash_combine(seed, val.fls); return seed; @@ -134,7 +137,7 @@ bool BorderInfo::operator < (const BorderInfo& right) const } bool FontInfo::operator == (const FontInfo & rVal) const { - const bool res = + const bool res = dyHeight== rVal.dyHeight && name == rVal.name && scheme == rVal.scheme && @@ -149,10 +152,8 @@ bool FontInfo::operator == (const FontInfo & rVal) const uls == rVal.uls && bFamily == rVal.bFamily && bCharSet == rVal.bCharSet && - - ((icv == rVal.icv && rVal.color.enabled == false && color.enabled == false) || - - (color == rVal.color)) + icv == rVal.icv && + color == rVal.color ; return res;