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

Fix bug #64634

Browse Source
This commit is contained in:
Viktor Andreev
2023-10-20 19:43:58 +06:00
parent 007904d170
commit e84824efc5
4 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OOXML/Common/SimpleTypes_Spreadsheet.cpp
View File

@ -2666,7 +2666,7 @@ namespace SimpleTypes
case axisCol: return L"axisCol";
case axisPage: return L"axisPage";
case axisRow: return L"axisRow";
case axisValues: return L"countNums";
case axisValues: return L"axisValues";
default : return L"";
}
}

11
OOXML/DocxFormat/Drawing/DrawingExt.cpp
View File

@ -129,7 +129,7 @@ namespace OOX
sResult += L" relId=\"" + m_oRelId->ToString() + L"\"";
}
sResult += L" minVer=\"http://schemas.openxmlformats.org/drawingml/2006/diagram\"/>";
return sResult;
}
EElementType CDataModelExt::getType() const
@ -214,7 +214,7 @@ namespace OOX
*m_sUri == L"{46F421CA-312F-682f-3DD2-61675219B42D}" ||
*m_sUri == L"{DE250136-89BD-433C-8126-D09CA5730AF9}" ||
*m_sUri == L"{19B8F6BF-5375-455C-9EA6-DF929625EA0E}" ||
*m_sUri == L"{725AE2AE-9491-48be-B2B4-4EB974FC3084}" ||
*m_sUri == L"{725AE2AE-9491-48be-B2B4-4EB974FC3084}" ||
*m_sUri == L"{231B7EB2-2AFC-4442-B178-5FFDF5851E7C}" ||
*m_sUri == L"{FCE6A71B-6B00-49CD-AB44-F6B1AE7CDE65}" ||
*m_sUri == L"{56B9EC1D-385E-4148-901F-78D8002777C0}" ||
@ -248,7 +248,7 @@ namespace OOX
OOX::Spreadsheet::CConditionalFormatting* pConditionalFormatting = new OOX::Spreadsheet::CConditionalFormatting();
*pConditionalFormatting = oReader;
m_arrConditionalFormatting.push_back(pConditionalFormatting);
}
}
}
else if (sName == L"dataValidations")
{
@ -507,7 +507,7 @@ namespace OOX
NSStringUtils::CStringBuilder writer;
writer.StartNode(L"externalReference");
writer.StartAttributes();
if (m_oFileKey.IsInit()) writer.WriteAttribute(L"fileKey", *m_oFileKey);
if (m_oInstanceId.IsInit()) writer.WriteAttribute(L"instanceId", *m_oInstanceId);
@ -624,7 +624,7 @@ namespace OOX
}
pWriter->WriteNodeEnd(ns + L"extLst");
}
}
std::wstring COfficeArtExtensionList::toXML() const
{
return toXMLWithNS(L"a:");
@ -886,6 +886,7 @@ namespace OOX
{
OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
oExt->m_sUri = L"{725AE2AE-9491-48be-B2B4-4EB974FC3084}";
oExt->m_sAdditionalNamespace = L"xmlns:x14=\"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main\"";
oExt->m_oPivotCacheDefinitionExt = ptr->m_PCD14;
if (oExt)

117
OOXML/XlsxFormat/Pivot/Pivots.cpp
View File

@ -148,7 +148,7 @@ namespace Spreadsheet
xlsb->ReadBin(oPath, pivotTableStream.get());
if (pivotTableStream != nullptr)
{
{
//XLS::BaseObjectPtr ptr(static_cast<XLS::BaseObject*>(pivotTableStream.get()), NullDeleter());
//XLS::BaseObjectPtr ptr = boost::make_shared<XLS::BaseObject>(static_cast<XLS::BaseObject*>(pivotTableStream.get()));
m_oPivotTableDefinition = pivotTableStream;
@ -284,7 +284,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"updatedVersion", m_oUpdatedVersion, m_oUpdatedVersion->GetValue());
WritingStringNullableAttrBool2(L"useAutoFormatting", m_oUseAutoFormatting);
WritingStringNullableAttrBool2(L"visualTotals", m_oVisualTotals);
writer.WriteString(L">");
if(m_oLocation.IsInit())
@ -293,7 +293,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if(m_oPivotFields.IsInit())
m_oPivotFields->toXML(writer);
if(m_oRowFields.IsInit())
m_oRowFields->toXML2(writer, L"rowFields");
m_oRowFields->toXML2(writer, L"rowFields");
if(m_oRowItems.IsInit())
m_oRowItems->toXML2(writer, L"rowItems");
if(m_oColFields.IsInit())
@ -304,7 +304,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_oPageFields->toXML(writer);
if(m_oDataFields.IsInit())
m_oDataFields->toXML(writer);
if(m_oFormats.IsInit())
m_oFormats->toXML(writer);
//if(m_oConditionalFormats.IsInit())
@ -322,7 +322,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
// m_oRowHierarchiesUsage->toXML(writer);
//if(m_oColHierarchiesUsage.IsInit())
// m_oColHierarchiesUsage->toXML(writer);
if(m_oExtLst.IsInit())
{
writer.WriteString(m_oExtLst->toXMLWithNS(_T("")));
@ -449,7 +449,8 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_oDataCaption = ptr->irstData.value();
// m_oDataOnRows = ptr->fDefaultCompact;
m_oDataPosition = ptr->ipos4Data;
if(ptr->ipos4Data > 0)
m_oDataPosition = ptr->ipos4Data;
if(ptr->fDisableFList)
m_oDisableFieldList = ptr->fDisableFList;
@ -677,7 +678,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<" + sName);
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -685,7 +686,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</" + sName + L">");
}
void CColumnRowFields::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -765,7 +766,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<" + sName);
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -773,7 +774,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</" + sName + L">");
}
void CColumnRowItems::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -831,7 +832,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"r", m_oR, m_oR->GetValue());
WritingStringNullableAttrString(L"t", m_oT, m_oT->ToString());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -959,7 +960,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<dataFields");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -967,7 +968,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</dataFields>");
}
void CDataFields::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -1155,7 +1156,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<pageFields");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -1163,7 +1164,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</pageFields>");
}
void CPageFields::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -1280,7 +1281,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<items");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -1288,7 +1289,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</items>");
}
void CFieldItems::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -1474,7 +1475,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<pivotFields");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -1482,7 +1483,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</pivotFields>");
}
void CPivotFields::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -1577,7 +1578,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrString(L"itemPageCount",m_oItemPageCount, m_oItemPageCount->ToString());
WritingStringNullableAttrString(L"numFmtId", m_oNumFmtId, m_oNumFmtId->ToString());
writer.WriteString(L">");
if(m_oAutoSortScope.IsInit())
m_oAutoSortScope->toXML(writer);
@ -1645,8 +1646,10 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
else if(ptr->sxaxis.bRw)
m_oAxis = SimpleTypes::Spreadsheet::EPivotAxisType::axisRow;
else if(ptr->sxaxis.bData)
{
m_oAxis = SimpleTypes::Spreadsheet::EPivotAxisType::axisValues;
m_oDataField = ptr->sxaxis.bData;
}
if(!ptr->fCompact)
m_oCompact = ptr->fCompact;
@ -1655,7 +1658,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if(ptr->fCount)
m_oCountSubtotal = ptr->fCount;
//m_oDataField = ptr->fDrilledLevel;
m_oDataSourceSort = ptr->fTensorSort;
if(ptr->fItemsDrilledByDefault)
@ -1830,7 +1833,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingElement_ReadAttributes_Read_else_if ( oReader, L"varPSubtotal", m_oVarPSubtotal )
WritingElement_ReadAttributes_Read_else_if ( oReader, L"varSubtotal", m_oVarSubtotal )
WritingElement_ReadAttributes_End( oReader )
}
}
//------------------------------------
void CReferences::toXML(NSStringUtils::CStringBuilder& writer) const
@ -1840,7 +1843,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<references");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -1848,7 +1851,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</references>");
}
void CReferences::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -1912,7 +1915,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrBool2(L"varPSubtotal", m_oVarPSubtotal);
WritingStringNullableAttrBool2(L"varSubtotal", m_oVarSubtotal);
writer.WriteString(L">");
if(m_oX.IsInit())
{
m_oX->toXML(writer);
@ -2012,7 +2015,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<formats");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -2020,7 +2023,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</formats>");
}
void CPivotTableFormats::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -2070,7 +2073,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrString(L"action", m_oAction, m_oAction->ToString());
WritingStringNullableAttrString(L"dxfId", m_oDxfId, m_oDxfId->ToString());
writer.WriteString(L">");
if(m_oPivotArea.IsInit())
{
m_oPivotArea->toXML(writer);
@ -2123,12 +2126,12 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingElement_ReadAttributes_Read_if ( oReader, L"action", m_oAction )
WritingElement_ReadAttributes_Read_else_if ( oReader, L"dxfId", m_oDxfId )
WritingElement_ReadAttributes_End( oReader )
}
}
//------------------------------------
void CAutoSortScope::toXML(NSStringUtils::CStringBuilder& writer) const
{
writer.WriteString(L"<autoSortScope>");
if(m_oPivotArea.IsInit())
{
m_oPivotArea->toXML(writer);
@ -2178,7 +2181,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrBool2(L"outline", m_oOutline);
WritingStringNullableAttrString(L"offsetRef", m_oOffsetRef, *m_oOffsetRef);
writer.WriteString(L">");
if(m_oReferences.IsInit())
{
m_oReferences->toXML(writer);
@ -2249,7 +2252,8 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if(ptr->pruleheaderdata.fLabelOnly)
m_oLabelOnly = ptr->pruleheaderdata.fLabelOnly;
if(!ptr->pruleheaderdata.rfxLoc.toString().empty())
if(!ptr->pruleheaderdata.rfxLoc.toString().empty()
&& (ptr->pruleheaderdata.rfxLoc.rowFirst!=0 || ptr->pruleheaderdata.rfxLoc.columnFirst!=0))
m_oOffsetRef = ptr->pruleheaderdata.rfxLoc.toString();
if(!ptr->pruleheaderdata.fLineMode)
@ -2310,7 +2314,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"rowPageCount", m_oRowPageCount, m_oRowPageCount->GetValue());
writer.WriteString(L"/>");
}
void CPivotTableLocation::ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
WritingElement_ReadAttributes_Start( oReader )
@ -2493,8 +2497,8 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if(m_oCacheSource.IsInit())
m_oCacheSource->toXML(writer);
if(m_oCacheFields.IsInit())
m_oCacheFields->toXML(writer);
m_oCacheFields->toXML(writer);
if(m_oExtLst.IsInit())
{
writer.WriteString(m_oExtLst->toXMLWithNS(_T("")));
@ -2559,6 +2563,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_oCreatedVersion = ptr->bVerCacheCreated;
m_oMinRefreshableVersion = ptr->bVerCacheRefreshableMin;
if(ptr->citmGhostMax > 0)
m_oMissingItemsLimit = ptr->citmGhostMax;
if(ptr->fOptimizeCache)
@ -2625,7 +2630,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<cacheFields");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -2633,7 +2638,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</cacheFields>");
}
void CPivotCacheFields::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -2694,7 +2699,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"mappingCount", m_oMappingCount, m_oMappingCount->GetValue());
WritingStringNullableAttrInt(L"numFmtId", m_oNumFmtId, m_oNumFmtId->GetValue());
writer.WriteString(L">");
if(m_oSharedItems.IsInit())
{
m_oSharedItems->toXML(writer);
@ -2805,7 +2810,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingElement_ReadAttributes_Read_else_if ( oReader, L"mappingCount", m_oMappingCount )
WritingElement_ReadAttributes_Read_else_if ( oReader, L"uniqueList", m_oNumFmtId )
WritingElement_ReadAttributes_End( oReader )
}
}
//------------------------------------
void CSharedItems::toXML(NSStringUtils::CStringBuilder& writer) const
{
@ -2833,7 +2838,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</sharedItems>");
}
void CSharedItems::fromXML(XmlUtils::CXmlLiteReader& oReader)
@ -3070,7 +3075,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<discretePr");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -3122,7 +3127,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<groupItems");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -3379,7 +3384,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingElement_ReadAttributes_Read_else_if ( oReader, L"m_oEndNum", m_oEndNum )
WritingElement_ReadAttributes_Read_else_if ( oReader, L"m_oGroupInterval", m_oGroupInterval )
WritingElement_ReadAttributes_End( oReader )
}
}
//------------------------------------
void CPivotCharacterValue::toXML(NSStringUtils::CStringBuilder& writer) const
{
@ -3546,7 +3551,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if ( L"x" == sName )
m_arrItems.push_back(PPTX::CreatePtrXmlContent<CMemberPropertyIndex>(oReader));
}
}
}
void CPivotErrorValue::fromBin(XLS::BaseObjectPtr& obj)
{
ReadAttributes(obj);
@ -4060,7 +4065,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"connectionId", m_oConnectionId, m_oConnectionId->GetValue());
WritingStringNullableAttrString(L"type", m_oType, m_oType->ToString());
writer.WriteString(L">");
if(m_oWorksheetSource.IsInit())
{
m_oWorksheetSource->toXML(writer);
@ -4173,7 +4178,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
if(!ptr->sheetName.value().empty())
m_oSheet = ptr->sheetName.value();
if(!ptr->range.toString().empty())
if(!ptr->range.toString().empty() && ptr->range.toString() != L"A1")
m_oRef = ptr->range.toString();
if(!ptr->namedRange.value().empty())
@ -4198,7 +4203,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<pages");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -4254,7 +4259,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<page");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -4349,7 +4354,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<rangeSets");
WritingStringAttrInt(L"count", (int)m_arrItems.size());
writer.WriteString(L">");
for ( size_t i = 0; i < m_arrItems.size(); ++i)
{
if ( m_arrItems[i] )
@ -4472,7 +4477,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
writer.WriteString(L"<consolidation");
WritingStringNullableAttrBool2(L"autoPage", m_oAutoPage);
writer.WriteString(L">");
if(m_oPages.IsInit())
{
m_oPages->toXML(writer);
@ -4538,7 +4543,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
WritingStringNullableAttrInt(L"base", m_oBase, m_oBase->GetValue());
WritingStringNullableAttrInt(L"par", m_oPar, m_oPar->GetValue());
writer.WriteString(L">");
if(m_oDiscretePr.IsInit())
{
m_oDiscretePr->toXML(writer);
@ -4637,7 +4642,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
return;
}
NSFile::CFileBinary::ReadAllBytes(oPath.GetPath(), &m_pData, m_nDataLength);
return;
//XmlUtils::CXmlLiteReader oReader;
@ -4729,7 +4734,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
auto ptr = static_cast<XLSB::PIVOTCACHERECORDS*>(obj.get());
if(ptr != nullptr)
{
{
NSStringUtils::CStringBuilder writer;
writer.WriteString(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
writer.WriteString(L"<pivotCacheRecords \
@ -4747,7 +4752,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
while(false == ptr->m_arPIVOTCACHERECORD.empty())
{
//m_arrItems.push_back(new CPivotCacheRecord(item));
CPivotCacheRecord xmlItem(ptr->m_arPIVOTCACHERECORD.front());
xmlItem.toXML(writer);
ptr->m_arPIVOTCACHERECORD.erase(ptr->m_arPIVOTCACHERECORD.begin());
@ -4777,7 +4782,7 @@ xmlns:xr16=\"http://schemas.microsoft.com/office/spreadsheetml/2017/revision16\"
m_arrItems[i]->toXML(writer);
}
}
writer.WriteString(L"</r>");
}
void CPivotCacheRecord::fromXML(XmlUtils::CXmlLiteReader& oReader)

2
OOXML/XlsxFormat/Slicer/SlicerCacheExt.cpp
View File

@ -763,7 +763,7 @@ void CSlicerCaches::toXML(NSStringUtils::CStringBuilder& writer, const std::wstr
writer.StartNode(sPrefix + sName);
writer.StartAttributes();
std::wstring sChildPrefix;
if(sPrefix.length() > 0 && L"x14:" != sPrefix)
if(sPrefix.length() > 0 && L"x14:" == sPrefix)
{
sChildPrefix = L"x14:";
writer.WriteAttribute(L"xmlns:x14", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");