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

Fix metadata xlst conversion

Browse Source
This commit is contained in:
Viktor Andreev
2025-07-10 21:41:22 +06:00
parent a84491cf74
commit 5e9f0d762a
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OOXML/XlsxFormat/Worksheets/SheetData.cpp
View File

@ -577,6 +577,7 @@ namespace OOX
m_oType.SetValue(SimpleTypes::Spreadsheet::celltypeNumber);
m_oShowPhonetic.FromBool(false);
m_oCellMetadata.reset();
m_oValue.Clean();
m_oFormula.Clean();
m_oRichText.reset(NULL);
@ -698,22 +699,26 @@ namespace OOX
nLen += m_oRichText->getXLSBSize();
}
oStream.XlsbStartRecord(nType, nLen);
oStream.WriteULONG(m_nCol & 0x3FFF);
_UINT32 nFlags2 = m_nStyle;
if (m_oShowPhonetic.ToBool())
{
nFlags2 |= 0x1000000;
}
//if (m_oCellMetadata.IsInit())
//{
// nFlags2 |= 0x2000000;
//}
//if (m_oValueMetadata.IsInit())
//{
// nFlags2 |= 0x4000000;
//}
if (m_oCellMetadata.IsInit())
{
nFlags2 |= 0x2000000;
nLen += 4;
}
if (m_oValueMetadata.IsInit())
{
nFlags2 |= 0x4000000;
nLen += 4;
}
oStream.XlsbStartRecord(nType, nLen);
oStream.WriteULONG(m_nCol & 0x3FFF);
oStream.WriteULONG(nFlags2);
//todo RkNumber
switch(nType)
@ -755,15 +760,13 @@ namespace OOX
{
m_oRichText->toXLSBExt(oStream);
}
//it's not by XLSB format
//if (m_oCellMetadata.IsInit())
//{
// oStream.WriteULONG(*m_oCellMetadata);
//}
//if (m_oValueMetadata.IsInit())
//{
// oStream.WriteULONG(*m_oValueMetadata);
//}
if (m_oCellMetadata.IsInit())
{
oStream.WriteULONG(*m_oCellMetadata);
}
if (m_oValueMetadata.IsInit())
oStream.WriteULONG(*m_oValueMetadata);
oStream.XlsbEndRecord();
}