Compare commits

..

4 Commits

Author SHA1 Message Date
334620cd5a hidePivotFieldList in Editor.bin 2017-09-26 17:19:58 +03:00
4a5fca5ccf hidePivotFieldList in Editor.bin 2017-09-26 17:18:05 +03:00
66dae03919 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
* 'develop' of https://github.com/ONLYOFFICE/core:
  fix bug #35895
  x2t version up
  OdfFormatReader - fix after testing
2017-09-26 16:37:52 +03:00
114a01f364 event for drag&drop content in ios11 2017-09-26 16:37:43 +03:00
4 changed files with 800 additions and 774 deletions

File diff suppressed because it is too large Load Diff

View File

@ -202,6 +202,8 @@ namespace BinXlsxRW
{
Date1904 = 0,
DateCompatibility = 1,
HidePivotFieldList = 2,
ShowPivotChartFilter = 3
};}
namespace c_oSerWorkbookViewTypes{enum c_oSerWorkbookViewTypes
{

View File

@ -1553,7 +1553,19 @@ namespace BinXlsxRW
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBOOL(workbookPr.m_oDateCompatibility->ToBool());
}
}
if(workbookPr.m_oHidePivotFieldList.IsInit())
{
m_oBcw.m_oStream.WriteBYTE(c_oSerWorkbookPrTypes::HidePivotFieldList);
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBOOL(workbookPr.m_oHidePivotFieldList->ToBool());
}
if(workbookPr.m_oShowPivotChartFilter.IsInit())
{
m_oBcw.m_oStream.WriteBYTE(c_oSerWorkbookPrTypes::ShowPivotChartFilter);
m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
m_oBcw.m_oStream.WriteBOOL(workbookPr.m_oShowPivotChartFilter->ToBool());
}
}
void WriteBookViews(const OOX::Spreadsheet::CBookViews& bookViews)
{
int nCurPos;

View File

@ -1574,6 +1574,16 @@ namespace BinXlsxRW {
m_oWorkbook.m_oWorkbookPr->m_oDateCompatibility.Init();
m_oWorkbook.m_oWorkbookPr->m_oDateCompatibility->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
}
else if(c_oSerWorkbookPrTypes::HidePivotFieldList == type)
{
m_oWorkbook.m_oWorkbookPr->m_oHidePivotFieldList.Init();
m_oWorkbook.m_oWorkbookPr->m_oHidePivotFieldList->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
}
else if(c_oSerWorkbookPrTypes::ShowPivotChartFilter == type)
{
m_oWorkbook.m_oWorkbookPr->m_oShowPivotChartFilter.Init();
m_oWorkbook.m_oWorkbookPr->m_oShowPivotChartFilter->SetValue(false != m_oBufferedStream.GetBool() ? SimpleTypes::onoffTrue : SimpleTypes::onoffFalse);
}
else
res = c_oSerConstants::ReadUnknown;
return res;