pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 01:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #55027

Browse Source
This commit is contained in:
Elena Subbotina
2022-01-21 15:33:26 +03:00
parent e78b399810
commit abc74e21d0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.cpp
View File

@ -550,8 +550,8 @@ void CConditionalFormattingRule::toXML2(NSStringUtils::CStringBuilder& writer, b
std::wstring node_name = bExtendedWrite ? L"x14:cfRule" : L"cfRule";
writer.WriteString(L"<" + node_name);
WritingStringAttrString(L"type", m_oType->ToString());
WritingStringAttrInt(L"priority", m_oPriority->GetValue());
WritingStringNullableAttrString(L"type", m_oType, m_oType->ToString());
WritingStringNullableAttrInt(L"priority", m_oPriority, m_oPriority->GetValue());
if (m_oAboveAverage.IsInit() && false == m_oAboveAverage->ToBool())
writer.WriteString(L" aboveAverage=\"0\"");
if (m_oBottom.IsInit() && true == m_oBottom->ToBool())

10
XlsxSerializerCom/Writer/BinaryReader.cpp
View File

@ -3747,6 +3747,11 @@ int BinaryWorksheetsTableReader::ReadWorksheet(boost::unordered_map<BYTE, std::v
OOX::Spreadsheet::CSheetProtection oProtection;
READ2_DEF_SPREADSHEET(length, res, this->ReadProtection, &oProtection);
SEEK_TO_POS_END(oProtection);
//-------------------------------------------------------------------------------------------------------------
SEEK_TO_POS_START(c_oSerWorksheetsTypes::ProtectedRanges);
OOX::Spreadsheet::CProtectedRanges oProtectedRanges;
READ1_DEF(length, res, this->ReadProtectedRanges, &oProtectedRanges);
SEEK_TO_POS_END(oProtectedRanges);
//-------------------------------------------------------------------------------------------------------------
SEEK_TO_POS_START(c_oSerWorksheetsTypes::Autofilter);
OOX::Spreadsheet::CAutofilter oAutofilter;
@ -3852,11 +3857,6 @@ int BinaryWorksheetsTableReader::ReadWorksheet(boost::unordered_map<BYTE, std::v
OOX::Spreadsheet::CHyperlinks oHyperlinks;
READ1_DEF(length, res, this->ReadHyperlinks, &oHyperlinks);
SEEK_TO_POS_END(oHyperlinks);
//-------------------------------------------------------------------------------------------------------------
SEEK_TO_POS_START(c_oSerWorksheetsTypes::ProtectedRanges);
OOX::Spreadsheet::CProtectedRanges oProtectedRanges;
READ1_DEF(length, res, this->ReadProtectedRanges, &oProtectedRanges);
SEEK_TO_POS_END(oProtectedRanges);
//-------------------------------------------------------------------------------------------------------------
SEEK_TO_POS_START(c_oSerWorksheetsTypes::PrintOptions);
OOX::Spreadsheet::CPrintOptions oPrintOptions;