diff --git a/XlsxSerializerCom/Common/BinReaderWriterDefines.h b/XlsxSerializerCom/Common/BinReaderWriterDefines.h index 60c317fbab..dd1719d114 100644 --- a/XlsxSerializerCom/Common/BinReaderWriterDefines.h +++ b/XlsxSerializerCom/Common/BinReaderWriterDefines.h @@ -218,7 +218,9 @@ namespace BinXlsxRW { DefaultColWidth = 0, DefaultRowHeight = 1, - BaseColWidth = 2 + BaseColWidth = 2, + CustomHeight = 3, + ZeroHeight = 4 };} namespace c_oSerRowTypes{enum c_oSerRowTypes { diff --git a/XlsxSerializerCom/Reader/BinaryWriter.h b/XlsxSerializerCom/Reader/BinaryWriter.h index a46d3625a8..e3eab51edd 100644 --- a/XlsxSerializerCom/Reader/BinaryWriter.h +++ b/XlsxSerializerCom/Reader/BinaryWriter.h @@ -2485,6 +2485,20 @@ namespace BinXlsxRW { m_oBcw.m_oStream.WriteByte(c_oSerPropLenType::Long); m_oBcw.m_oStream.WriteLong(oSheetFormatPr.m_oBaseColWidth->GetValue()); } + //CustomHeight + if(oSheetFormatPr.m_oCustomHeight.IsInit()) + { + m_oBcw.m_oStream.WriteByte(c_oSerSheetFormatPrTypes::CustomHeight); + m_oBcw.m_oStream.WriteByte(c_oSerPropLenType::Byte); + m_oBcw.m_oStream.WriteByte(oSheetFormatPr.m_oCustomHeight->ToBool()); + } + //ZeroHeight + if(oSheetFormatPr.m_oZeroHeight.IsInit()) + { + m_oBcw.m_oStream.WriteByte(c_oSerSheetFormatPrTypes::ZeroHeight); + m_oBcw.m_oStream.WriteByte(c_oSerPropLenType::Byte); + m_oBcw.m_oStream.WriteByte(oSheetFormatPr.m_oZeroHeight->ToBool()); + } } void WritePageMargins(const OOX::Spreadsheet::CPageMargins& oPageMargins) { diff --git a/XlsxSerializerCom/Writer/BinaryReader.h b/XlsxSerializerCom/Writer/BinaryReader.h index 8db43d3d54..b1ce2d0363 100644 --- a/XlsxSerializerCom/Writer/BinaryReader.h +++ b/XlsxSerializerCom/Writer/BinaryReader.h @@ -2831,6 +2831,16 @@ namespace BinXlsxRW { pSheetFormatPr->m_oBaseColWidth.Init(); pSheetFormatPr->m_oBaseColWidth->SetValue(m_oBufferedStream.ReadLong()); } + else if (c_oSerSheetFormatPrTypes::CustomHeight == type) + { + pSheetFormatPr->m_oCustomHeight.Init(); + pSheetFormatPr->m_oCustomHeight->FromBool(m_oBufferedStream.ReadBool()); + } + else if (c_oSerSheetFormatPrTypes::ZeroHeight == type) + { + pSheetFormatPr->m_oZeroHeight.Init(); + pSheetFormatPr->m_oZeroHeight->FromBool(m_oBufferedStream.ReadBool()); + } else res = c_oSerConstants::ReadUnknown; return res; diff --git a/XlsxSerializerCom/version.h b/XlsxSerializerCom/version.h index c7603795fc..4742224f14 100644 --- a/XlsxSerializerCom/version.h +++ b/XlsxSerializerCom/version.h @@ -2,6 +2,6 @@ //1 //0 //0 -//102 -#define INTVER 1,0,0,102 -#define STRVER "1,0,0,102\0" +//104 +#define INTVER 1,0,0,104 +#define STRVER "1,0,0,104\0"