scheme for dynamic/static lib & bugs

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

DesktopEditor/common/base_export.h

+#ifndef _BUILD_BASE_EXPORTIMPORT_H
+#define _BUILD_BASE_EXPORTIMPORT_H
+
+#ifndef Q_DECL_EXPORT
+
+#ifndef Q_BUILDCUSTOM_VISIBILITY_AVAILABLE
+#ifdef QT_VISIBILITY_AVAILABLE
+#define Q_BUILDCUSTOM_VISIBILITY_AVAILABLE
+#endif
+#endif
+
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)
+#define Q_DECL_EXPORT     __declspec(dllexport)
+#define Q_DECL_IMPORT     __declspec(dllimport)
+#elif defined(Q_BUILDCUSTOM_VISIBILITY_AVAILABLE)
+#define Q_DECL_EXPORT     __attribute__((visibility("default")))
+#define Q_DECL_IMPORT     __attribute__((visibility("default")))
+#endif
+
+#ifndef Q_DECL_EXPORT
+#define Q_DECL_EXPORT
+#endif
+#ifndef Q_DECL_IMPORT
+#define Q_DECL_IMPORT
+#endif
+
+#endif
+
+#endif // _BUILD_BASE_EXPORTIMPORT_H

DesktopEditor/xml/include/xmlutils.h

@@ -252,7 +252,7 @@ namespace XmlUtils
 		{
 			std::wstring sAttr;
 			if (GetAttributeIfExist(std::wstring(bsName), sAttr))
-				value = sAttr.GetString();
+				value = sAttr;
 		}
 		template<typename T>
 		void ReadAllAttributes(T& strNames, T& strValues)
@@ -260,11 +260,11 @@ namespace XmlUtils
 			if (!IsValid())
 				return;
 
-			std::map<CStringA, CStringA>::iterator p;
+			std::map<std::string, std::string>::iterator p;
 			for (p = m_pBase->m_attributes.begin(); p != m_pBase->m_attributes.end(); ++p)
 			{
-				strNames.push_back(NSFile::CUtf8Converter::GetUnicodeFromCharPtr(p->first.GetString(), p->first.GetLength(), true));
-				strValues.push_back(NSFile::CUtf8Converter::GetUnicodeFromCharPtr(p->second.GetString(), p->second.GetLength(), true));
+				strNames.push_back(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)p->first.c_str(), (LONG)p->first.length()), true);
+				strValues.push_back(NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)p->second.c_str(), (LONG)p->second.length()), true);
 			}
 		}
 		template <typename T>
@@ -280,4 +280,4 @@ namespace XmlUtils
 	};
 }
 
-#endif // _BUILD_XMLUTILS_CROSSPLATFORM_H_
\ No newline at end of file
+#endif // _BUILD_XMLUTILS_CROSSPLATFORM_H_