x2t linux 64 build

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

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -83,7 +83,7 @@ namespace BinXlsxRW{
 		oBinaryFileReader.ReadFile(sSrcFileName, sDstPath, &oOfficeDrawingConverter, sXMLOptions);
 		return true;
 	}
-    bool CXlsxSerializer::saveToFile(const CString& sDstFileName, const CString& sSrcPath, CString& sXMLOptions)
+    bool CXlsxSerializer::saveToFile(const CString& sDstFileName, const CString& sSrcPath, const CString& sXMLOptions)
 	{
 		COfficeFontPicker* pFontPicker = new COfficeFontPicker();
 		pFontPicker->Init(m_sFontDir);

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -29,7 +29,7 @@ namespace BinXlsxRW {
 		void CreateXlsxFolders(CString& sXmlOptions, CString sDstPath,  CString& sMediaPath, CString& sEmbedPath);
 
         bool loadFromFile(const CString& sSrcFileName, const CString& sDstPath, const CString& sXMLOptions, const CString& sMediaDir, const CString& sEmbedPath);
-        bool saveToFile(const CString& sSrcFileName, const CString& sDstPath, CString& sXMLOptions);
+        bool saveToFile(const CString& sSrcFileName, const CString& sDstPath, const CString& sXMLOptions);
 		
 		bool loadChart(CString& sChartPath, NSBinPptxRW::CBinaryFileWriter& oBufferedStream, long& lDataSize);
 		bool saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilename, CString& sContentTypePath, CString** sContentTypeElement);

ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp

@@ -35,8 +35,8 @@ namespace PPTX
 			if (lpShapeElement == NULL)
 				return;
 
-			double dCoordSizeX = (double)max(lWidth, 1);
-			double dCoordSizeY = (double)max(lHeight, 1);
+            double dCoordSizeX = (double)(std::max)((int)lWidth, 1);
+            double dCoordSizeY = (double)(std::max)((int)lHeight, 1);
 
 			LONG lCoordSize = 100000;
 
@@ -95,8 +95,8 @@ namespace PPTX
 				double _dHeight = ShapeSize;
 				lpShapeElement->m_oShape.m_pShape->GetWidthHeightLogic(_dWidth, _dHeight);
 
-				double dkoefX = (double)lCoordSize / max(1, _dWidth);
-				double dkoefY = (double)lCoordSize / max(1, _dHeight);
+                double dkoefX = (double)lCoordSize / (std::max)(1., _dWidth);
+                double dkoefY = (double)lCoordSize / (std::max)(1., _dHeight);
 
 				strRect = _T("");
 				strRect.Format(_T("%d,%d,%d,%d"), (int)(dkoefX * txRect.left), (int)(dkoefY * txRect.top),

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -3300,7 +3300,7 @@ namespace BinXlsxRW {
 			RELEASEOBJECT(m_oBcw);
 		}
         void Open(const CString& sInputDir, const CString& sFileDst, NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager,
-			NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, CString& sXMLOptions)
+            NSBinPptxRW::CDrawingConverter* pOfficeDrawingConverter, const CString& sXMLOptions)
 		{
 			OOX::CPath path(sFileDst);
 			//   media