From 4a6c0e340ba1aa8af64ee2d3887dddb2d5c63f09 Mon Sep 17 00:00:00 2001 From: "Elena.Subbotina" Date: Fri, 20 Jan 2023 18:30:44 +0300 Subject: [PATCH] update external --- .../Binary/Sheets/Common/BinReaderWriterDefines.h | 4 ++-- OOXML/Binary/Sheets/Reader/BinaryWriter.cpp | 12 ++++++------ OOXML/Binary/Sheets/Writer/BinaryReader.cpp | 8 ++++---- OOXML/DocxFormat/Drawing/DrawingExt.cpp | 10 +++++----- OOXML/DocxFormat/Drawing/DrawingExt.h | 4 ++-- OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp | 14 +++++++------- OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h b/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h index 996d59d4f6..c3e675a808 100644 --- a/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h +++ b/OOXML/Binary/Sheets/Common/BinReaderWriterDefines.h @@ -230,8 +230,8 @@ namespace BinXlsxRW SlicerCache = 20, Protection = 21, OleSize = 22, - ExternalFileId = 23, - ExternalPortalName = 24 + ExternalFileKey = 23, + ExternalInstanceId = 24 };} namespace c_oSerWorkbookProtection {enum c_oSerWorkbookProtection{ AlgorithmName = 0, diff --git a/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp b/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp index 8fe5a6e46c..ecd0a521ae 100644 --- a/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp +++ b/OOXML/Binary/Sheets/Reader/BinaryWriter.cpp @@ -2841,16 +2841,16 @@ void BinaryWorkbookTableWriter::WriteExternalReferences(const OOX::Spreadsheet:: int nCurPos2 = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::ExternalReference); - if (pExternalLink->m_oFileId.IsInit()) + if (pExternalLink->m_oFileKey.IsInit()) { - int nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::ExternalFileId); - m_oBcw.m_oStream.WriteStringW3(*pExternalLink->m_oFileId); + int nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::ExternalFileKey); + m_oBcw.m_oStream.WriteStringW3(*pExternalLink->m_oFileKey); m_oBcw.WriteItemWithLengthEnd(nCurPos); } - if (pExternalLink->m_oPortalName.IsInit()) + if (pExternalLink->m_oInstanceId.IsInit()) { - int nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::ExternalPortalName); - m_oBcw.m_oStream.WriteStringW3(*pExternalLink->m_oPortalName); + int nCurPos = m_oBcw.WriteItemStart(c_oSerWorkbookTypes::ExternalInstanceId); + m_oBcw.m_oStream.WriteStringW3(*pExternalLink->m_oInstanceId); m_oBcw.WriteItemWithLengthEnd(nCurPos); } if (pExternalLink->m_oExternalBook.IsInit()) diff --git a/OOXML/Binary/Sheets/Writer/BinaryReader.cpp b/OOXML/Binary/Sheets/Writer/BinaryReader.cpp index d1a7219bbd..e742d63c98 100644 --- a/OOXML/Binary/Sheets/Writer/BinaryReader.cpp +++ b/OOXML/Binary/Sheets/Writer/BinaryReader.cpp @@ -2720,13 +2720,13 @@ int BinaryWorkbookTableReader::ReadExternalReference(BYTE type, long length, voi externalLink->m_oDdeLink.Init(); READ1_DEF(length, res, this->ReadDdeLink, externalLink->m_oDdeLink.GetPointer()); } - else if (c_oSerWorkbookTypes::ExternalFileId == type) + else if (c_oSerWorkbookTypes::ExternalFileKey == type) { - externalLink->m_oFileId = m_oBufferedStream.GetString4(length); + externalLink->m_oFileKey = m_oBufferedStream.GetString4(length); } - else if (c_oSerWorkbookTypes::ExternalPortalName == type) + else if (c_oSerWorkbookTypes::ExternalInstanceId == type) { - externalLink->m_oPortalName = m_oBufferedStream.GetString4(length); + externalLink->m_oInstanceId = m_oBufferedStream.GetString4(length); } else res = c_oSerConstants::ReadUnknown; diff --git a/OOXML/DocxFormat/Drawing/DrawingExt.cpp b/OOXML/DocxFormat/Drawing/DrawingExt.cpp index 6b93549a6c..15787bf478 100644 --- a/OOXML/DocxFormat/Drawing/DrawingExt.cpp +++ b/OOXML/DocxFormat/Drawing/DrawingExt.cpp @@ -301,8 +301,8 @@ namespace OOX else if (sName == L"externalReference") { WritingElement_ReadAttributes_Start_No_NS(oReader) - WritingElement_ReadAttributes_Read_if(oReader, L"fileId", m_oFileId) - WritingElement_ReadAttributes_Read_else_if(oReader, L"portalName", m_oPortalName) + WritingElement_ReadAttributes_Read_if(oReader, L"fileKey", m_oFileKey) + WritingElement_ReadAttributes_Read_else_if(oReader, L"instanceId", m_oInstanceId) WritingElement_ReadAttributes_End_No_NS(oReader) } } @@ -451,14 +451,14 @@ namespace OOX m_oPivotCacheDefinitionExt->toXML(writer, L"x14:pivotCacheDefinition"); sResult += writer.GetData().c_str(); } - if (m_oFileId.IsInit() || m_oPortalName.IsInit()) + if (m_oFileKey.IsInit() || m_oInstanceId.IsInit()) { NSStringUtils::CStringBuilder writer; writer.StartNode(L"externalReference"); writer.StartAttributes(); - if (m_oFileId.IsInit()) writer.WriteAttribute(L"fileId", *m_oFileId); - if (m_oPortalName.IsInit()) writer.WriteAttribute(L"portalName", *m_oPortalName); + if (m_oFileKey.IsInit()) writer.WriteAttribute(L"fileKey", *m_oFileKey); + if (m_oInstanceId.IsInit()) writer.WriteAttribute(L"portalName", *m_oInstanceId); writer.EndAttributes(); writer.EndNode(L"externalReference"); diff --git a/OOXML/DocxFormat/Drawing/DrawingExt.h b/OOXML/DocxFormat/Drawing/DrawingExt.h index 49215415e1..3d299d8c48 100644 --- a/OOXML/DocxFormat/Drawing/DrawingExt.h +++ b/OOXML/DocxFormat/Drawing/DrawingExt.h @@ -152,8 +152,8 @@ namespace OOX nullable m_oPresenceInfo; - nullable_string m_oFileId; - nullable_string m_oPortalName; + nullable_string m_oFileKey; + nullable_string m_oInstanceId; }; //-------------------------------------------------------------------------------- diff --git a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp index b2869b25e0..2edbc6fdeb 100644 --- a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp +++ b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.cpp @@ -1272,11 +1272,11 @@ namespace Spreadsheet for (size_t i = 0; (oExtLst.IsInit()) && (i < oExtLst->m_arrExt.size()); i++) { - if (oExtLst->m_arrExt[i]->m_oFileId.IsInit() || - oExtLst->m_arrExt[i]->m_oPortalName.IsInit()) + if (oExtLst->m_arrExt[i]->m_oFileKey.IsInit() || + oExtLst->m_arrExt[i]->m_oInstanceId.IsInit()) { - m_oFileId = oExtLst->m_arrExt[i]->m_oFileId; - m_oPortalName = oExtLst->m_arrExt[i]->m_oPortalName; + m_oFileKey = oExtLst->m_arrExt[i]->m_oFileKey; + m_oInstanceId = oExtLst->m_arrExt[i]->m_oInstanceId; break; } } @@ -1304,11 +1304,11 @@ namespace Spreadsheet { m_oDdeLink->toXML(sXml); } - if (m_oFileId.IsInit() || m_oPortalName.IsInit()) + if (m_oFileKey.IsInit() || m_oInstanceId.IsInit()) { OOX::Drawing::COfficeArtExtension oExt; - oExt.m_oFileId = m_oFileId; - oExt.m_oPortalName = m_oPortalName; + oExt.m_oFileKey = m_oFileKey; + oExt.m_oInstanceId = m_oInstanceId; oExt.m_sUri = L"{C3750BE0-5CA9-4D1C-82C7-79D762991C26}"; diff --git a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h index 205ffb7191..a0d601d071 100644 --- a/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h +++ b/OOXML/XlsxFormat/ExternalLinks/ExternalLinks.h @@ -561,8 +561,8 @@ namespace OOX nullable m_oOleLink; nullable m_oDdeLink; - nullable_string m_oFileId; - nullable_string m_oPortalName; + nullable_string m_oFileKey; + nullable_string m_oInstanceId; private: CPath m_oReadPath; std::wstring m_rId;