x2t version 2.4.498

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -585,7 +585,7 @@ void XlsxConverter::convert_sharing_string(int number)
 	const OOX::Spreadsheet::CSharedStrings *SharedStrings= xlsx_document->GetSharedStrings();
 	if (!SharedStrings) return;
 
-	std::unordered_map<int, OOX::Spreadsheet::CSi*>::const_iterator pFind = SharedStrings->m_mapItems.find(number);
+    std::map<int, OOX::Spreadsheet::CSi*>::const_iterator pFind = SharedStrings->m_mapItems.find(number);
 
 	if (pFind != SharedStrings->m_mapItems.end())
 	{

Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h

@@ -36,7 +36,7 @@
 #include "../CommonInclude.h"
 
 #include "Si.h"
-#include <unordered_map>
+#include <map>
 
 namespace OOX
 {
@@ -172,7 +172,7 @@ namespace OOX
 		public:
 			nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oCount;
 			nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oUniqueCount;
-			std::unordered_map<int, CSi*>					m_mapItems;
+            std::map<int, CSi*>                             m_mapItems;
 			int												m_nCount;
 
 		};

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.4.494.0
+VERSION = 2.4.498.0
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -1376,7 +1376,7 @@ namespace BinXlsxRW
 		{
 			int nCurPos;
 			
-			for ( auto it = sharedString.m_mapItems.begin(); it != sharedString.m_mapItems.end(); it++)
+            for ( std::map<int, OOX::Spreadsheet::CSi*>::iterator it = sharedString.m_mapItems.begin(); it != sharedString.m_mapItems.end(); it++)
 			{
 				nCurPos = m_oBcw.WriteItemStart(c_oSerSharedStringTypes::Si);
 				WriteSharedString(it->second, pIndexedColors, pTheme, oFontProcessor);

XlsxSerializerCom/Writer/BinaryReader.h

@@ -2535,7 +2535,7 @@ namespace BinXlsxRW {
 				{
 					m_pCurVmlDrawing->m_mapComments = &m_pCurWorksheet->m_mapComments;
 
-					std::map<std::wstring, unsigned int> mapByAuthors;
+                    std::unordered_map<std::wstring, unsigned int> mapByAuthors;
 					OOX::Spreadsheet::CComments* pComments = new OOX::Spreadsheet::CComments();
 					
 					pComments->m_oCommentList.Init();
@@ -2559,7 +2559,7 @@ namespace BinXlsxRW {
 							if(pCommentItem->m_sAuthor.IsInit())
 							{
 								const std::wstring& sAuthor = pCommentItem->m_sAuthor.get();
-								std::map<std::wstring, unsigned int>::const_iterator pFind = mapByAuthors.find(sAuthor);
+                                std::unordered_map<std::wstring, unsigned int>::const_iterator pFind = mapByAuthors.find(sAuthor);
 								
 								int nAuthorId;
 								if(pFind != mapByAuthors.end())
@@ -3522,7 +3522,7 @@ namespace BinXlsxRW {
 					{
 						int nValue = _wtoi(pCell->m_oValue->ToString().c_str());
 
-						std::unordered_map<int, OOX::Spreadsheet::CSi*>::iterator pFind = m_pSharedStrings->m_mapItems.find(nValue);
+                        std::map<int, OOX::Spreadsheet::CSi*>::iterator pFind = m_pSharedStrings->m_mapItems.find(nValue);
 
 						if(pFind != m_pSharedStrings->m_mapItems.end())
 						{

XlsxSerializerCom/Writer/CSVWriter.cpp

@@ -243,7 +243,7 @@ namespace CSVWriter
 								{
 									int nValue = _wtoi(pCell->m_oValue->ToString().c_str());
 
-									std::unordered_map<int, OOX::Spreadsheet::CSi*>::iterator pFind = pSharedStrings->m_mapItems.find(nValue);
+                                    std::map<int, OOX::Spreadsheet::CSi*>::iterator pFind = pSharedStrings->m_mapItems.find(nValue);
 									if (pFind != pSharedStrings->m_mapItems.end())
 									{
 										OOX::Spreadsheet::CSi *pSi = pFind->second;