linux build

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

ASCOfficePPTXFile/PPTXFormat/Limit/ChartBuildType.h

 #pragma once
+
 #ifndef PPTX_LIMIT_CHARTBUILDTYPE_INCLUDE_H_
 #define PPTX_LIMIT_CHARTBUILDTYPE_INCLUDE_H_
 
@@ -12,7 +13,7 @@ namespace PPTX
 		class ChartBuildType : public BaseLimit
 		{
 		public:
-			ChartBuildType::ChartBuildType()
+            ChartBuildType()
 			{
 				m_strValue = _T("allAtOnce");
 			}
@@ -34,4 +35,4 @@ namespace PPTX
 	} // namespace Limit
 } // namespace PPTX
 
-#endif // PPTX_LIMIT_CHARTBUILDTYPE_INCLUDE_H_
\ No newline at end of file
+#endif // PPTX_LIMIT_CHARTBUILDTYPE_INCLUDE_H_

DesktopEditor/common/Types.h

@@ -72,25 +72,25 @@ typedef unsigned long		ULONG, ARGB;
 typedef long HRESULT;
 
 #ifdef WIN32
-#include "winerror.h"
+    #include "winerror.h"
+    #ifndef max
+        #define max(a,b)            (((a) > (b)) ? (a) : (b))
+    #endif
+
+    #ifndef min
+        #define min(a,b)            (((a) < (b)) ? (a) : (b))
+    #endif
 #else
-#ifndef S_OK
-#define S_OK                                   ((HRESULT)0x00000000L)
-#define S_FALSE                                ((HRESULT)0x00000001L)
-#endif
-#endif
-
-#ifndef max
-#define max(a,b)            (((a) > (b)) ? (a) : (b))
+    #ifndef S_OK
+        #define S_OK                                   ((HRESULT)0x00000000L)
+        #define S_FALSE                                ((HRESULT)0x00000001L)
+    #endif
 #endif
 
-#ifndef min
-#define min(a,b)            (((a) < (b)) ? (a) : (b))
-#endif
 
 #ifndef RGB
-typedef int RGB;
-#define RGB(r,g,b) ((r)<<16|(g)<<8|(b))
+    typedef int RGB;
+    #define RGB(r,g,b) ((r)<<16|(g)<<8|(b))
 #endif