convertion ods->xlsx->json

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -31,13 +31,13 @@
  */
 
 #include "WordDocument.h"
-#include "../../../Common/OfficeFileErrorDescription.h"
+#include "../../Common/OfficeFileErrorDescription.h"
 
-#include "../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/SummaryInformation.h"
-#include "../../../ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.h"
+#include "../../ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/SummaryInformation.h"
+#include "../../ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.h"
 
-#include "../../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
-#include "../../../DesktopEditor/common/File.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../DesktopEditor/common/File.h"
 
 namespace DocFileFormat
 {

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include "../../../Common/3dParty/pole/pole.h"
+#include "../../../../Common/3dParty/pole/pole.h"
 
 
 #include "CFRecordType.h"

ASCOfficeXlsFile2/source/XlsFormat/Crypt/Crypt.h

@@ -33,7 +33,7 @@
 
 #include <string>
 #include <boost/shared_ptr.hpp>
-#include "../../../Common/DocxFormat/Source/Base/Types_32.h"
+#include "../../../../Common/DocxFormat/Source/Base/Types_32.h"
 
 namespace CRYPT
 {

XlsxSerializerCom/Writer/CSVWriter.cpp

@@ -233,16 +233,10 @@ namespace CSVWriter
 									if (0 <= nValue && nValue < pSharedStrings->m_arrItems.size())
 									{
 										OOX::Spreadsheet::CSi *pSi = static_cast<OOX::Spreadsheet::CSi *>(pSharedStrings->m_arrItems[nValue]);
-										if (NULL != pSi && pSi->m_arrItems.size() > 0)
-											if(NULL != pSi && pSi->m_arrItems.size() > 0)
-											{
-												OOX::Spreadsheet::WritingElement* pWe = pSi->m_arrItems[0];
-												if(OOX::Spreadsheet::et_t == pWe->getType())
-												{
-													OOX::Spreadsheet::CText* pText = static_cast<OOX::Spreadsheet::CText*>(pWe);
-													sCellValue = pText->m_sText;
-												}
-											}
+										if(NULL != pSi)
+										{
+											sCellValue = pSi->ToString();
+										}
 									}
 								}
 								else