для сборки AscOfficeDocxFile2 с _USE_LIBXML2_READER_

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

Common/DocxFormat/Projects/DocxFormat2005.vcproj

@@ -1349,6 +1349,62 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Base"
+			>
+			<File
+				RelativePath="..\Source\Base\ASCString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Base\Base.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Base\Nullable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Base\SmartPtr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Base\unicode_util.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\Base\unicode_util.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="XML"
+			>
+			<File
+				RelativePath="..\Source\XML\stringcommon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\XML\stringcommon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\XML\StringWriter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\XML\Utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\XML\XmlSimple.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Source\XML\xmlutils.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\Source\SystemUtility\FileSystem\Directory.cpp"
 			>

Common/DocxFormat/Source/XML/Utils.h

@@ -219,7 +219,7 @@ namespace XmlUtils
 		sResult.Replace(_T("\""),	_T("""));
 		return sResult;
 	}
-#ifndef _USE_LIBXML2_READER_
+//#ifndef _USE_LIBXML2_READER_
 	class CStringWriter
 	{
 	private:
@@ -285,7 +285,7 @@ namespace XmlUtils
 
 	public:
 
-        AVSINLINE void WriteString(wchar_t* pString, size_t& nLen)
+        AVSINLINE void WriteString(wchar_t* pString, size_t nLen)
 		{
 			AddSize(nLen);
 			//memcpy(m_pDataCur, pString, nLen * sizeof(wchar_t));
@@ -456,5 +456,5 @@ namespace XmlUtils
 			return m_arTableUnicodes[c];
 		}
 	};	
-#endif // ifndef _USE_LIBXML2_READER_
+//#endif // ifndef _USE_LIBXML2_READER_
 }

Common/DocxFormat/Source/XML/stringcommon.cpp

+#include "stringcommon.h"
+
+std::wstring string2std_string(const CString& val)
+{
+	return std::wstring(val.GetString());
+}
+std::string string2std_string(const CStringA& val)
+{
+	return std::string(val.GetString());
+}
+CString std_string2string(const std::wstring& val)
+{
+	return CString(val.c_str());
+}
+CStringA std_string2string(const std::string& val)
+{
+	return CStringA(val.c_str());
+}
\ No newline at end of file

Common/DocxFormat/Source/XML/stringcommon.h

+#ifndef XML_COMMON
+#define XML_COMMON
+
+#include <string>
+#ifdef _WIN32
+#include <atlbase.h>
+#include <atlstr.h>
+#else
+#include "../Base/ASCString.h"
+#endif
+
+std::wstring string2std_string(const CString& val);
+std::string string2std_string(const CStringA& val);
+CString std_string2string(const std::wstring& val);
+CStringA std_string2string(const std::string& val);
+#endif //XML_COMMON
\ No newline at end of file