From 02ffd2c680a2329e23ebb1c19fc30e4eae002c9b Mon Sep 17 00:00:00 2001
From: "Vladimir.Gorshenkov" <vladimir.gorshenkov@onlyoffice.com>
Date: Fri, 25 Mar 2022 00:06:15 +0300
Subject: [PATCH] [xlsb][write] delete extra prop

---
 .../Source/XlsxFormat/Workbook/Workbook.h     | 28 +++++++++----------
 Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp  |  1 -
 Common/DocxFormat/Source/XlsxFormat/Xlsx.h    |  1 -
 X2tConverter/src/ASCConverters.cpp            |  1 -
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h b/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h
index 91b1a2bb7f..136d7a2047 100644
--- a/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h
+++ b/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h
@@ -395,13 +395,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">
 					}
 				}
 			}
-			virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
-			{
-
-				if(dynamic_cast<CXlsx*>(File::m_pMainDocument)->m_bIsBin)
-				{
-					writeBin(oPath);
-				}
+			virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
+			{
+
+				if(dynamic_cast<CXlsb*>(File::m_pMainDocument))
+				{
+					writeBin(oPath);
+				}
 				else
 				{
 					NSStringUtils::CStringBuilder sXml;
@@ -460,13 +460,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\">
 
 				}
 			}
-			virtual const OOX::FileType type() const
-			{
-				if (m_bMacroEnabled)	return OOX::Spreadsheet::FileTypes::WorkbookMacro;
-				else if (dynamic_cast<CXlsx*>(File::m_pMainDocument)->m_bIsBin)		return OOX::Spreadsheet::FileTypes::WorkbookBin;
-				else					return OOX::Spreadsheet::FileTypes::Workbook;
-			}
-			virtual const CPath DefaultDirectory() const
+			virtual const OOX::FileType type() const
+			{
+				if (m_bMacroEnabled)	return OOX::Spreadsheet::FileTypes::WorkbookMacro;
+				else if (dynamic_cast<CXlsb*>(File::m_pMainDocument))		return OOX::Spreadsheet::FileTypes::WorkbookBin;
+				else					return OOX::Spreadsheet::FileTypes::Workbook;
+			}
+			virtual const CPath DefaultDirectory() const
 			{
 				return type().DefaultDirectory();
 			}
diff --git a/Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp b/Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp
index 50ae29140c..90febc09ae 100644
--- a/Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp
+++ b/Common/DocxFormat/Source/XlsxFormat/Xlsx.cpp
@@ -82,7 +82,6 @@ void OOX::Spreadsheet::CXlsx::init()
     m_nLastReadRow      = 0;
     m_nLastReadCol      = -1;
     m_bNeedCalcChain    = true;
-	m_bIsBin			= false;
 
     bDeleteWorkbook			= false;
     bDeleteSharedStrings	= false;
diff --git a/Common/DocxFormat/Source/XlsxFormat/Xlsx.h b/Common/DocxFormat/Source/XlsxFormat/Xlsx.h
index a02a905070..a10c3ee714 100644
--- a/Common/DocxFormat/Source/XlsxFormat/Xlsx.h
+++ b/Common/DocxFormat/Source/XlsxFormat/Xlsx.h
@@ -103,7 +103,6 @@ namespace OOX
 			int												m_nLastReadRow;
 			int												m_nLastReadCol;
 			bool											m_bNeedCalcChain;// disable because it is useless but reading takes considerable time
-			bool											m_bIsBin; // save to xlsb/xls format
 
 			std::vector<CWorksheet*>								m_arWorksheets;	//order as is
 			std::map<std::wstring, OOX::Spreadsheet::CWorksheet*>	m_mapWorksheets; //copy, for fast find - order by rId(name) 
diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp
index 28ccdeba0b..729b9fd962 100644
--- a/X2tConverter/src/ASCConverters.cpp
+++ b/X2tConverter/src/ASCConverters.cpp
@@ -3078,7 +3078,6 @@ namespace NExtractTools
 		oXlsb.Read(OOX::CPath(sXlsxDir));
 
 		OOX::CContentTypes oContentTypes;
-		oXlsb.m_bIsBin = true;
 		nRes = oXlsb.WriteNative(sTempUnpackedXLSB, oContentTypes) ? S_OK : AVS_FILEUTILS_ERROR_CONVERT;
 
 		if (SUCCEEDED_X2T(nRes))