previous build is broken (win32)

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

Common/DocxFormat/Source/Base/SmartPtr.h

 #pragma once
 #include "Base.h"
-#include "../../../../ServerComponents/DesktopEditor/common/Types.h"
+#include "../../../../DesktopEditor/common/Types.h"
 
 namespace NSCommon
 {

Common/DocxFormat/Source/Common/SimpleTypes_Base.h

@@ -3,7 +3,7 @@
 #include "math.h"
 #include "../Common/Unit.h"
 #include "../XML/xmlutils.h"
-#include "../../../DesktopEditor/common/Types.h"
+#include "../../../../DesktopEditor/common/Types.h"
 
 
 namespace SimpleTypes

Common/DocxFormat/Source/XML/Utils.h

@@ -6,8 +6,10 @@
 #ifdef _WIN32
 #include <atlcoll.h>
 #include <atlenc.h>
-
+#include <comutil.h>
 #endif
+
+
 #ifndef _USE_NULLABLE_PROPERTY_
 using namespace NSCommon;
 #endif
@@ -213,7 +215,7 @@ namespace XmlUtils
 		sResult.Replace(_T("\""),	_T("&quot;"));
 		return sResult;
 	}
-    /*
+#ifndef _USE_LIBXML2_READER_
 	class CStringWriter
 	{
 	private:
@@ -450,5 +452,5 @@ namespace XmlUtils
 			return m_arTableUnicodes[c];
 		}
 	};	
-    */
+#endif // ifndef _USE_LIBXML2_READER_
 }