previous build is broken (win32)

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

Common/DocxFormat/Source/Base/Base.h

@@ -47,11 +47,11 @@
 #define _ATL_ALL_WARNINGS
 #endif
 
-//#include <windows.h>
-//#include <atlbase.h>
-//#include <atlcoll.h>
-//#include <atlstr.h>
-//#include <atltypes.h>
+#include <windows.h>
+#include <atlbase.h>
+#include <atlcoll.h>
+#include <atlstr.h>
+#include <atltypes.h>
 
 #include "../../../ASCUtils.h"
 

Common/DocxFormat/Source/Common/Utils.cpp

@@ -2,6 +2,26 @@
 
 #include "../XML/xmlutils.h"
 
+#ifdef _WIN32
+void Common::readAllShapeTypes(const OOX::CPath& oPath, CSimpleArray<CString>& aShapetypes)
+{
+	XmlUtils::CXmlLiteReader oReader;
+
+	if ( !oReader.FromFile( oPath.GetPath() ) )
+		return;
+
+	while ( FALSE != oReader.ReadNextNode() )
+	{
+		CString sName = oReader.GetName();
+		if(_T("v:shapetype") == sName)
+		{
+			CString sXml = oReader.GetOuterXml();
+			if(false == sXml.IsEmpty())
+                aShapetypes.Add(sXml);
+		}
+	}
+}
+#else
 void Common::readAllShapeTypes(const OOX::CPath& oPath, std::vector<CString>& aShapetypes)
 {
 	XmlUtils::CXmlLiteReader oReader;
@@ -20,3 +40,5 @@ void Common::readAllShapeTypes(const OOX::CPath& oPath, std::vector<CString>& aS
 		}
 	}
 }
+#endif
+

Common/DocxFormat/Source/Common/Utils.h

@@ -7,7 +7,12 @@
 
 namespace Common
 {
-    void readAllShapeTypes(const OOX::CPath& oPath, std::vector<CString>& aShapetypes);
+#ifdef _WIN32
+    void readAllShapeTypes(const OOX::CPath& oPath, CSimpleArray<CString>& aShapetypes);
+#else
+	void readAllShapeTypes(const OOX::CPath& oPath, std::vector<CString>& aShapetypes);
+#endif
+
 } // namespace Common
 
 #endif // COMMON_UTILS_INCLUDE_H_

Common/DocxFormat/Source/XML/xmlutils.h

@@ -2777,7 +2777,7 @@ __forceinline const bool operator!=(const wchar_t* cwsStr1, const CWCharWrapper&
 
 #endif // #ifdef _WIN32
 
-#define _USE_LIBXML2_READER_
+//#define _USE_LIBXML2_READER_
 
 #ifdef _USE_LIBXML2_READER_