linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58565 954022d7-b5bf-4e40-9824-e11837661b57

Common/DocxFormat/Source/Base/Base.h

@@ -90,9 +90,11 @@ typedef wchar_t WCHAR;
 #define _wtoi64(p) std::wcstoll((p),NULL,10)
 #ifdef UNICODE
 #define _ttoi _wtoi
+#define _tstof _wtof
 #define _stscanf swscanf
 #else
 #define _ttoi atoi
+#define _tstof atof
 #define _stscanf scanf
 #endif // #ifdef UNICODE
 #endif // #ifndef _wtof

Common/DocxFormat/Source/XlsxFormat/Chart/Chart.h

@@ -41,7 +41,8 @@ namespace OOX
 			}
 			virtual void write(const CPath& oPath, const CPath& oDirectory, CContentTypes& oContent) const
 			{
-				write2(oPath.GetPath());
+                CString sPath = oPath.GetPath();
+                write2(sPath);
 				oContent.Registration( type().OverrideType(), oDirectory, oPath.GetFilename() );
 				IFileContainer::Write(oPath, oDirectory, oContent);
 			}
@@ -53,7 +54,8 @@ namespace OOX
 			}
 			void toXML(XmlUtils::CStringWriter& writer) const
 			{
-				m_oChartSpace.toXML(CString(_T("c:chartSpace")), writer);
+                CString sNodeName = _T("c:chartSpace");
+                m_oChartSpace.toXML (sNodeName, writer);
 			}
 			bool isValid() const
 			{
@@ -87,4 +89,4 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_CHART_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_CHART_FILE_INCLUDE_H_

Common/DocxFormat/Source/XlsxFormat/Common.cpp

 #include "CommonInclude.h"
 #include "Common.h"
+
+#ifndef _gcvt
+#include "stdlib.h"
+#define _CVTBUFSIZE  128
+#define _gcvt gcvt
+#endif
+
 #define DBL_MAX 15
 #define DBL_MAXDIG10 17
 
@@ -14,4 +21,4 @@ CString OOX::Spreadsheet::SpreadsheetCommon::WriteDouble(double dVal)
 	if(nLength > 0 && '.' == sRes[nLength - 1])
 		sRes = sRes.Left(nLength - 1);
 	return sRes;
-}
\ No newline at end of file
+}

Common/DocxFormat/Source/XlsxFormat/Styles/NumFmts.h

@@ -28,7 +28,8 @@ namespace OOX
 			}
 			virtual void toXML(XmlUtils::CStringWriter& writer) const
 			{
-				toXML2(writer, CString(_T("numFmt")));
+                CString sHeader = _T("numFmt");
+                toXML2(writer, sHeader);
 			}
 			void toXML2(XmlUtils::CStringWriter& writer, CString& sHeader) const
 			{
@@ -151,4 +152,4 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_NUMFMTS_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_NUMFMTS_FILE_INCLUDE_H_

Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h

@@ -8,7 +8,7 @@
 #include "CellStyles.h"
 #include "Xfs.h"
 #include "Colors.h"
-#include "Dxf.h"
+#include "dxf.h"
 #include "Fills.h"
 #include "Fonts.h"
 #include "NumFmts.h"
@@ -230,4 +230,4 @@ namespace OOX
 	} //Spreadsheet
 } // namespace OOX
 
-#endif // OOX_STYLES_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_STYLES_FILE_INCLUDE_H_