Merge pull request 'fix bug #73433' (#251) from fix/bug73433 into hotfix/v8.3.2

ElenaSubbotina · ElenaSubbotina · commit 37a5ce4781b1 · 2025-03-11T17:50:57.000Z
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/251
diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_records/FileSharing.h b/MsBinaryFile/XlsFile/Format/Logic/Biff_records/FileSharing.h
@@ -56,7 +56,7 @@ class FileSharing: public BiffRecord
 	static const ElementType	type = typeFileSharing;
 
     Boolean<unsigned short>     fReadOnlyRec;
-    unsigned short              wResPassNum;
+    unsigned short              wResPassNum = 0;
     std::wstring                wResPass;
     _UINT16                     iNoResPass;
     XLUnicodeString             stUNUsername;
diff --git a/OOXML/XlsxFormat/Workbook/Workbook.cpp b/OOXML/XlsxFormat/Workbook/Workbook.cpp
@@ -427,8 +427,18 @@ namespace OOX
 				workBookStream->m_FRTWORKBOOK = m_oExtLst->toBinWorkBook();
 
 			if (m_oFileSharing.IsInit())
-				workBookStream->m_BrtFileSharing = m_oFileSharing->toBin();
-
+            {
+                auto sharingVector = m_oFileSharing->toBin();
+                if(sharingVector.size() == 2)
+                {
+                    workBookStream->m_BrtFileSharingIso = sharingVector.at(0);
+                    workBookStream->m_BrtFileSharing = sharingVector.at(1);
+                }
+                else if(sharingVector.size() == 1)
+                {
+                    workBookStream->m_BrtFileSharing = sharingVector.at(0);
+                }
+            }
 			return workBookStream;
 		}
 		void CWorkbook::read(const CPath& oPath)
diff --git a/OOXML/XlsxFormat/Workbook/WorkbookPr.cpp b/OOXML/XlsxFormat/Workbook/WorkbookPr.cpp
@@ -1,4 +1,4 @@
-/*
+﻿/*
  * (c) Copyright Ascensio System SIA 2010-2023
  *
  * This program is a free software product. You can redistribute it and/or
@@ -428,13 +428,13 @@ namespace OOX
 			if (!oReader.IsEmptyNode())
 				oReader.ReadTillEnd();
 		}
-		XLS::BaseObjectPtr CFileSharing::toBin()
+        std::vector<XLS::BaseObjectPtr> CFileSharing::toBin()
 		{
-			XLS::BaseObjectPtr objectPtr;
+            std::vector<XLS::BaseObjectPtr> objectVector;
 			if(m_oSpinCount.IsInit() || m_oAlgorithmName.IsInit() || m_oHashValue.IsInit())
 			{
 				auto ptr(new XLSB::FileSharingIso);
-				objectPtr = XLS::BaseObjectPtr{ptr};
+                XLS::BaseObjectPtr objectPtr = XLS::BaseObjectPtr{ptr};
 
 				if (m_oReadOnlyRecommended.IsInit())
 					ptr->fReadOnlyRec = m_oReadOnlyRecommended.get();
@@ -472,12 +472,18 @@ namespace OOX
                         bytes1, len1);
                 }
 				ptr->ipdPasswordData.rgbSalt.cbLength = len1;
+                auto ptr1(new XLSB::FileSharing);
+                ptr1->wResPass = L"";
+                ptr1->fReadOnlyRec = ptr->fReadOnlyRec;
+                ptr1->stUserName =  ptr->stUserName;
+                objectVector.push_back(objectPtr);
+                objectVector.push_back(XLS::BaseObjectPtr{ptr1});
 
 			}
 			else
 			{
 				auto ptr(new XLSB::FileSharing);
-				objectPtr = XLS::BaseObjectPtr{ptr};
+                XLS::BaseObjectPtr objectPtr = XLS::BaseObjectPtr{ptr};
 				if (m_oReadOnlyRecommended.IsInit())
 					ptr->fReadOnlyRec = m_oReadOnlyRecommended.get();
                 else
@@ -490,8 +496,9 @@ namespace OOX
                     ptr->wResPass = m_oPassword.get();
                 else
                     ptr->wResPass = L"";
+                objectVector.push_back(objectPtr);
 			}
-			return objectPtr;
+            return objectVector;
 		}
 		void CFileSharing::fromBin(XLS::BaseObjectPtr& obj)
 		{
diff --git a/OOXML/XlsxFormat/Workbook/WorkbookPr.h b/OOXML/XlsxFormat/Workbook/WorkbookPr.h
@@ -148,7 +148,7 @@ namespace OOX
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
 
 			void fromBin(XLS::BaseObjectPtr& obj);
-			XLS::BaseObjectPtr toBin();
+            std::vector<XLS::BaseObjectPtr> toBin();
 			virtual EElementType getType() const;
 
 			void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
diff --git a/OOXML/XlsxFormat/Worksheets/SheetData.cpp b/OOXML/XlsxFormat/Worksheets/SheetData.cpp
@@ -1130,7 +1130,7 @@ namespace OOX
         }
         namespace  SharedFormulasRef
         {
-            std::unique_ptr<std::vector<XLS::CellRef>> sharedRefsLocations;
+            std::unique_ptr<std::map<_UINT32,XLS::CellRef>> sharedRefsLocations;
 			std::unique_ptr<std::vector<std::pair<XLS::CellRangeRef, XLS::CellRef>>> ArrayRefsLocations;
         }
         void CFormula::fromBin(XLS::StreamCacheReaderPtr& reader, XLS::CFRecordPtr& record)
@@ -1157,9 +1157,10 @@ namespace OOX
                         rowRef = static_cast<XLS::PtgExp*>(BinFmla.rgce.sequence.begin()->get())->rowXlsb;
                         ColumnRef = static_cast<XLS::PtgExtraCol*>(BinFmla.rgcb.getPtgs().back().get())->col;
                         if(!SharedFormulasRef::sharedRefsLocations)
-                            SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::vector<XLS::CellRef>>(new std::vector<XLS::CellRef>);
-                        SharedFormulasRef::sharedRefsLocations->push_back(XLS::CellRef(rowRef, ColumnRef, true, true));
+                            SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::map<_UINT32, XLS::CellRef>>(new std::map<_UINT32, XLS::CellRef>);
                         m_oSi = (unsigned int)SharedFormulasRef::sharedRefsLocations->size() - 1;
+                        SharedFormulasRef::sharedRefsLocations->emplace(m_oSi->GetValue(), XLS::CellRef(rowRef, ColumnRef, true, true));
+
                     }
                 }
                 auto fmlaRecord = reader->getNextRecord(XLSB::rt_ShrFmla);
@@ -2926,7 +2927,7 @@ namespace OOX
                 case SimpleTypes::Spreadsheet::celltypeInlineStr:
                 case SimpleTypes::Spreadsheet::celltypeStr:
                 {
-                    if(m_oValue.IsInit() || m_oRichText.IsInit())
+                    if(m_oValue.IsInit() || m_oRichText.IsInit() || m_oFormula.IsInit())
                     {
                         if(!m_oFormula.IsInit())
                             CellRecord = writer->getNextRecord(XLSB::rt_CellSt);
@@ -2936,8 +2937,10 @@ namespace OOX
                         XLSB::XLWideString str;
                         if(m_oValue.IsInit())
                             str = m_oValue->m_sText;
-                        else
+                        else if(m_oRichText.IsInit())
                             str = m_oRichText->ToString();
+                        else
+                            str = L"";
                         *CellRecord << str;
                     }
                     else
@@ -2958,15 +2961,19 @@ namespace OOX
                 else if(m_oFormula->m_oT.get() == SimpleTypes::Spreadsheet::ECellFormulaType::cellformulatypeShared)
                 {
                     if(!SharedFormulasRef::sharedRefsLocations)
-                        SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::vector<XLS::CellRef>>(new std::vector<XLS::CellRef>);
+                        SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::map<_UINT32, XLS::CellRef>>(new std::map<_UINT32, XLS::CellRef>);
                     if(!m_oFormula->m_sText.empty())
                     {
                         ExtraRecord = writer->getNextRecord(XLSB::rt_ShrFmla);
-                        SharedFormulasRef::sharedRefsLocations->push_back(CellReference);
+                        if(!m_oFormula->m_oSi.IsInit())
+                            m_oFormula->m_oSi = (_UINT32)SharedFormulasRef::sharedRefsLocations->size();
+                        SharedFormulasRef::sharedRefsLocations->emplace(m_oFormula->m_oSi->GetValue(), CellReference);
+                        SharedFmlaRef = &CellReference;
                     }
-                    if(m_oFormula->m_oSi.IsInit() && m_oFormula->m_oSi->GetValue() < SharedFormulasRef::sharedRefsLocations->size())
+                    if(m_oFormula->m_oSi.IsInit() && SharedFormulasRef::sharedRefsLocations->find(m_oFormula->m_oSi->GetValue()) != SharedFormulasRef::sharedRefsLocations->end())
                     {
-                        SharedFmlaRef = &SharedFormulasRef::sharedRefsLocations->at(m_oFormula->m_oSi->GetValue());
+                        if(m_oFormula->m_sText.empty())
+                            SharedFmlaRef = &SharedFormulasRef::sharedRefsLocations->at(m_oFormula->m_oSi->GetValue());
                         XLS::CellParsedFormula BinFmla(false);
 
                         //пишем флаги для формулы
@@ -4727,6 +4734,8 @@ namespace OOX
             }
             if(SharedFormulasRef::sharedRefsLocations)
                 SharedFormulasRef::sharedRefsLocations.reset();
+            if(SharedFormulasRef::ArrayRefsLocations)
+                SharedFormulasRef::ArrayRefsLocations.reset();
         }
 		XLS::BaseObjectPtr CSheetData::toBin()
 		{
diff --git a/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp b/OOXML/XlsxFormat/Worksheets/WorksheetChildOther.cpp
@@ -2812,32 +2812,49 @@ namespace OOX
                     if(m_oOddHeader.IsInit())
                         dataString = m_oOddHeader->m_sText;
                     else
-                        dataString = L"";
+                        dataString.setSize(0xFFFFFFFF);
                     *begin << dataString;
+                }
+                {
+                    XLSB::XLNullableWideString dataString;
                     if(m_oOddFooter.IsInit())
                         dataString = m_oOddFooter->m_sText;
                     else
-                        dataString = L"";
+                        dataString.setSize(0xFFFFFFFF);
                     *begin << dataString;
+                }
+                {
+                    XLSB::XLNullableWideString dataString;
+
                     if(m_oEvenHeader.IsInit())
                         dataString = m_oEvenHeader->m_sText;
                     else
-                        dataString = L"";
+                        dataString.setSize(0xFFFFFFFF);
                     *begin << dataString;
+                }
+                {
+                    XLSB::XLNullableWideString dataString;
                     if(m_oEvenFooter.IsInit())
                         dataString = m_oEvenFooter->m_sText;
                     else
-                        dataString = L"";
-                     *begin << dataString;
+                        dataString.setSize(0xFFFFFFFF);
+                    *begin << dataString;
+                }
+                {
+                    XLSB::XLNullableWideString dataString;
+
                     if(m_oFirstHeader.IsInit())
                         dataString = m_oFirstHeader->m_sText;
                     else
-                        dataString = L"";
+                        dataString.setSize(0xFFFFFFFF);
                     *begin << dataString;
+                }
+                {
+                    XLSB::XLNullableWideString dataString;
                     if(m_oFirstFooter.IsInit())
                         dataString = m_oFirstFooter->m_sText;
                     else
-                        dataString = L"";
+                        dataString.setSize(0xFFFFFFFF);
                     *begin << dataString;
                 }
                 writer->storeNextRecord(begin);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*`
	`1`	`+/*`
`2`	`2`	`* (c) Copyright Ascensio System SIA 2010-2023`
`3`	`3`	`*`
`4`	`4`	`* This program is a free software product. You can redistribute it and/or`
`@@ -428,13 +428,13 @@ namespace OOX`
`428`	`428`	`if (!oReader.IsEmptyNode())`
`429`	`429`	`oReader.ReadTillEnd();`
`430`	`430`	`}`
`431`		`- XLS::BaseObjectPtr CFileSharing::toBin()`
	`431`	`+ std::vector<XLS::BaseObjectPtr> CFileSharing::toBin()`
`432`	`432`	`{`
`433`		`- XLS::BaseObjectPtr objectPtr;`
	`433`	`+ std::vector<XLS::BaseObjectPtr> objectVector;`
`434`	`434`	`if(m_oSpinCount.IsInit() \|\| m_oAlgorithmName.IsInit() \|\| m_oHashValue.IsInit())`
`435`	`435`	`{`
`436`	`436`	`auto ptr(new XLSB::FileSharingIso);`
`437`		`- objectPtr = XLS::BaseObjectPtr{ptr};`
	`437`	`+ XLS::BaseObjectPtr objectPtr = XLS::BaseObjectPtr{ptr};`
`438`	`438`
`439`	`439`	`if (m_oReadOnlyRecommended.IsInit())`
`440`	`440`	`ptr->fReadOnlyRec = m_oReadOnlyRecommended.get();`
`@@ -472,12 +472,18 @@ namespace OOX`
`472`	`472`	`bytes1, len1);`
`473`	`473`	`}`
`474`	`474`	`ptr->ipdPasswordData.rgbSalt.cbLength = len1;`
	`475`	`+ auto ptr1(new XLSB::FileSharing);`
	`476`	`+ ptr1->wResPass = L"";`
	`477`	`+ ptr1->fReadOnlyRec = ptr->fReadOnlyRec;`
	`478`	`+ ptr1->stUserName = ptr->stUserName;`
	`479`	`+ objectVector.push_back(objectPtr);`
	`480`	`+ objectVector.push_back(XLS::BaseObjectPtr{ptr1});`
`475`	`481`
`476`	`482`	`}`
`477`	`483`	`else`
`478`	`484`	`{`
`479`	`485`	`auto ptr(new XLSB::FileSharing);`
`480`		`- objectPtr = XLS::BaseObjectPtr{ptr};`
	`486`	`+ XLS::BaseObjectPtr objectPtr = XLS::BaseObjectPtr{ptr};`
`481`	`487`	`if (m_oReadOnlyRecommended.IsInit())`
`482`	`488`	`ptr->fReadOnlyRec = m_oReadOnlyRecommended.get();`
`483`	`489`	`else`
`@@ -490,8 +496,9 @@ namespace OOX`
`490`	`496`	`ptr->wResPass = m_oPassword.get();`
`491`	`497`	`else`
`492`	`498`	`ptr->wResPass = L"";`
	`499`	`+ objectVector.push_back(objectPtr);`
`493`	`500`	`}`
`494`		`- return objectPtr;`
	`501`	`+ return objectVector;`
`495`	`502`	`}`
`496`	`503`	`void CFileSharing::fromBin(XLS::BaseObjectPtr& obj)`
`497`	`504`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,7 @@ namespace OOX`
`1130`	`1130`	`}`
`1131`	`1131`	`namespace SharedFormulasRef`
`1132`	`1132`	`{`
`1133`		`- std::unique_ptr<std::vector<XLS::CellRef>> sharedRefsLocations;`
	`1133`	`+ std::unique_ptr<std::map<_UINT32,XLS::CellRef>> sharedRefsLocations;`
`1134`	`1134`	`std::unique_ptr<std::vector<std::pair<XLS::CellRangeRef, XLS::CellRef>>> ArrayRefsLocations;`
`1135`	`1135`	`}`
`1136`	`1136`	`void CFormula::fromBin(XLS::StreamCacheReaderPtr& reader, XLS::CFRecordPtr& record)`
`@@ -1157,9 +1157,10 @@ namespace OOX`
`1157`	`1157`	`rowRef = static_cast<XLS::PtgExp*>(BinFmla.rgce.sequence.begin()->get())->rowXlsb;`
`1158`	`1158`	`ColumnRef = static_cast<XLS::PtgExtraCol*>(BinFmla.rgcb.getPtgs().back().get())->col;`
`1159`	`1159`	`if(!SharedFormulasRef::sharedRefsLocations)`
`1160`		`- SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::vector<XLS::CellRef>>(new std::vector<XLS::CellRef>);`
`1161`		`- SharedFormulasRef::sharedRefsLocations->push_back(XLS::CellRef(rowRef, ColumnRef, true, true));`
	`1160`	`+ SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::map<_UINT32, XLS::CellRef>>(new std::map<_UINT32, XLS::CellRef>);`
`1162`	`1161`	`m_oSi = (unsigned int)SharedFormulasRef::sharedRefsLocations->size() - 1;`
	`1162`	`+ SharedFormulasRef::sharedRefsLocations->emplace(m_oSi->GetValue(), XLS::CellRef(rowRef, ColumnRef, true, true));`
	`1163`	`+`
`1163`	`1164`	`}`
`1164`	`1165`	`}`
`1165`	`1166`	`auto fmlaRecord = reader->getNextRecord(XLSB::rt_ShrFmla);`
`@@ -2926,7 +2927,7 @@ namespace OOX`
`2926`	`2927`	`case SimpleTypes::Spreadsheet::celltypeInlineStr:`
`2927`	`2928`	`case SimpleTypes::Spreadsheet::celltypeStr:`
`2928`	`2929`	`{`
`2929`		`- if(m_oValue.IsInit() \|\| m_oRichText.IsInit())`
	`2930`	`+ if(m_oValue.IsInit() \|\| m_oRichText.IsInit() \|\| m_oFormula.IsInit())`
`2930`	`2931`	`{`
`2931`	`2932`	`if(!m_oFormula.IsInit())`
`2932`	`2933`	`CellRecord = writer->getNextRecord(XLSB::rt_CellSt);`
`@@ -2936,8 +2937,10 @@ namespace OOX`
`2936`	`2937`	`XLSB::XLWideString str;`
`2937`	`2938`	`if(m_oValue.IsInit())`
`2938`	`2939`	`str = m_oValue->m_sText;`
`2939`		`- else`
	`2940`	`+ else if(m_oRichText.IsInit())`
`2940`	`2941`	`str = m_oRichText->ToString();`
	`2942`	`+ else`
	`2943`	`+ str = L"";`
`2941`	`2944`	`*CellRecord << str;`
`2942`	`2945`	`}`
`2943`	`2946`	`else`
`@@ -2958,15 +2961,19 @@ namespace OOX`
`2958`	`2961`	`else if(m_oFormula->m_oT.get() == SimpleTypes::Spreadsheet::ECellFormulaType::cellformulatypeShared)`
`2959`	`2962`	`{`
`2960`	`2963`	`if(!SharedFormulasRef::sharedRefsLocations)`
`2961`		`- SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::vector<XLS::CellRef>>(new std::vector<XLS::CellRef>);`
	`2964`	`+ SharedFormulasRef::sharedRefsLocations = std::unique_ptr<std::map<_UINT32, XLS::CellRef>>(new std::map<_UINT32, XLS::CellRef>);`
`2962`	`2965`	`if(!m_oFormula->m_sText.empty())`
`2963`	`2966`	`{`
`2964`	`2967`	`ExtraRecord = writer->getNextRecord(XLSB::rt_ShrFmla);`
`2965`		`- SharedFormulasRef::sharedRefsLocations->push_back(CellReference);`
	`2968`	`+ if(!m_oFormula->m_oSi.IsInit())`
	`2969`	`+ m_oFormula->m_oSi = (_UINT32)SharedFormulasRef::sharedRefsLocations->size();`
	`2970`	`+ SharedFormulasRef::sharedRefsLocations->emplace(m_oFormula->m_oSi->GetValue(), CellReference);`
	`2971`	`+ SharedFmlaRef = &CellReference;`
`2966`	`2972`	`}`
`2967`		`- if(m_oFormula->m_oSi.IsInit() && m_oFormula->m_oSi->GetValue() < SharedFormulasRef::sharedRefsLocations->size())`
	`2973`	`+ if(m_oFormula->m_oSi.IsInit() && SharedFormulasRef::sharedRefsLocations->find(m_oFormula->m_oSi->GetValue()) != SharedFormulasRef::sharedRefsLocations->end())`
`2968`	`2974`	`{`
`2969`		`- SharedFmlaRef = &SharedFormulasRef::sharedRefsLocations->at(m_oFormula->m_oSi->GetValue());`
	`2975`	`+ if(m_oFormula->m_sText.empty())`
	`2976`	`+ SharedFmlaRef = &SharedFormulasRef::sharedRefsLocations->at(m_oFormula->m_oSi->GetValue());`
`2970`	`2977`	`XLS::CellParsedFormula BinFmla(false);`
`2971`	`2978`
`2972`	`2979`	`//пишем флаги для формулы`
`@@ -4727,6 +4734,8 @@ namespace OOX`
`4727`	`4734`	`}`
`4728`	`4735`	`if(SharedFormulasRef::sharedRefsLocations)`
`4729`	`4736`	`SharedFormulasRef::sharedRefsLocations.reset();`
	`4737`	`+ if(SharedFormulasRef::ArrayRefsLocations)`
	`4738`	`+ SharedFormulasRef::ArrayRefsLocations.reset();`
`4730`	`4739`	`}`
`4731`	`4740`	`XLS::BaseObjectPtr CSheetData::toBin()`
`4732`	`4741`	`{`