Merge pull request 'Fix bug #72657' (#188) from fix/bug72657 into rel…

…ease/v8.3.0 Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/188
ONLYOFFICE · Jan 27, 2025 · d395e63 · d395e63
2 parents 0350675 + b91dfb0
commit d395e63
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/PtgExtraList.h b/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/PtgExtraList.h
@@ -54,7 +54,7 @@ class PtgExtraList : public Ptg
  // No type info
 
     const std::wstring toString() const;
-private:
+
     Boolean<unsigned char> hasColumns;
     unsigned char          rowType;
     _UINT16                cch;

diff --git a/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/PtgList.cpp b/MsBinaryFile/XlsFile/Format/Logic/Biff_structures/PtgList.cpp
@@ -31,6 +31,7 @@
  */
 
 #include "PtgList.h"
+#include "PtgExtraList.h"
 #include "../../../../../OOXML/Base/Unit.h"
 
 namespace XLS
@@ -98,6 +99,11 @@ void PtgList::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, bool ful
     {
         tableName = tableIndex->second;
     }
+    else if(nonresident && !extra_data.empty())
+    {
+        auto extraList = static_cast<PtgExtraList*>(extra_data.front().get());
+        tableName = extraList->table;
+    }
     else
     {
         tableName = XmlUtils::GenerateGuid();

diff --git a/OOXML/XlsbFormat/Xlsb.cpp b/OOXML/XlsbFormat/Xlsb.cpp
@@ -337,6 +337,10 @@ void OOX::Spreadsheet::CXlsb::PrepareTableFormula()
                         auto tableName = tableIndex->second;
                         formula.replace(formula.find(str), str.size(), tableName);
                     }
+                    else
+                    {
+                        formula.replace(formula.find(str), str.size(), L"#NAME?");
+                    }
                 }
                 str = STR::guidFromStr(formula);
             }