changes

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

DesktopEditor/Word_Api/Editor_Defines.h

@@ -580,161 +580,161 @@ namespace NSEditorApi
 {
 
 #define LINK_PROPERTY_INT(memberName)					\
-	inline int get_##memberName##()						\
+	inline int get_##memberName()						\
 	{													\
-		return m_n##memberName##;						\
+		return m_n##memberName;							\
 	}													\
-	inline void put_##memberName##(const int& newVal)	\
+	inline void put_##memberName(const int& newVal)		\
 	{													\
-		m_n##memberName## = newVal;						\
+		m_n##memberName = newVal;						\
 	}
 
 #define LINK_PROPERTY_DOUBLE(memberName)				\
-	inline double get_##memberName##()					\
+	inline double get_##memberName()					\
 	{													\
-		return m_d##memberName##;						\
+		return m_d##memberName;							\
 	}													\
-	inline void put_##memberName##(const double& newVal)\
+	inline void put_##memberName(const double& newVal)	\
 	{													\
-		m_d##memberName## = newVal;						\
+		m_d##memberName = newVal;						\
 	}
 
 #define LINK_PROPERTY_BOOL(memberName)					\
-	inline bool get_##memberName##()					\
+	inline bool get_##memberName()						\
 	{													\
-		return m_b##memberName##;						\
+		return m_b##memberName;							\
 	}													\
-	inline void put_##memberName##(const bool& newVal)	\
+	inline void put_##memberName(const bool& newVal)	\
 	{													\
-		m_b##memberName## = newVal;						\
+		m_b##memberName = newVal;						\
 	}
 
 #define LINK_PROPERTY_BYTE(memberName)					\
-	inline BYTE get_##memberName##()					\
+	inline BYTE get_##memberName()						\
 	{													\
-		return m_n##memberName##;						\
+		return m_n##memberName;							\
 	}													\
-	inline void put_##memberName##(const BYTE& newVal)	\
+	inline void put_##memberName(const BYTE& newVal)	\
 	{													\
-		m_n##memberName## = newVal;						\
+		m_n##memberName = newVal;						\
 	}
 
 #define LINK_PROPERTY_STRING(memberName)						\
-	inline std::wstring get_##memberName##()					\
+	inline std::wstring get_##memberName()						\
 	{															\
-		return m_s##memberName##;								\
+		return m_s##memberName;									\
 	}															\
-	inline void put_##memberName##(const std::wstring& newVal)	\
+	inline void put_##memberName(const std::wstring& newVal)	\
 	{															\
-		m_s##memberName## = newVal;								\
+		m_s##memberName = newVal;								\
 	}
 #define LINK_PROPERTY_STRINGA(memberName)						\
-	inline std::string get_##memberName##()						\
+	inline std::string get_##memberName()						\
 	{															\
-		return m_s##memberName##;								\
+		return m_s##memberName;									\
 	}															\
-	inline void put_##memberName##(const std::string& newVal)	\
+	inline void put_##memberName(const std::string& newVal)		\
 	{															\
-		m_s##memberName## = newVal;								\
+		m_s##memberName = newVal;								\
 	}
 
 // JS
 #define LINK_PROPERTY_INT_JS(memberName)								\
-	inline js_wrapper<int> get_##memberName##()							\
+	inline js_wrapper<int> get_##memberName()							\
 	{																	\
-		return m_n##memberName##;										\
+		return m_n##memberName;											\
 	}																	\
-	inline void put_##memberName##(const int& newVal)					\
+	inline void put_##memberName(const int& newVal)						\
 	{																	\
-		m_n##memberName## = newVal;										\
+		m_n##memberName = newVal;										\
 	}																	\
-	inline void put_##memberName##(const js_wrapper<int>& newVal)		\
+	inline void put_##memberName(const js_wrapper<int>& newVal)			\
 	{																	\
-		m_n##memberName## = newVal;										\
+		m_n##memberName = newVal;										\
 	}
 
 #define LINK_PROPERTY_DOUBLE_JS(memberName)								\
-	inline js_wrapper<double> get_##memberName##()						\
+	inline js_wrapper<double> get_##memberName()						\
 	{																	\
-		return m_d##memberName##;										\
+		return m_d##memberName;											\
 	}																	\
-	inline void put_##memberName##(const double& newVal)				\
+	inline void put_##memberName(const double& newVal)					\
 	{																	\
-		m_d##memberName## = newVal;										\
+		m_d##memberName = newVal;										\
 	}																	\
-	inline void put_##memberName##(const js_wrapper<double>& newVal)	\
+	inline void put_##memberName(const js_wrapper<double>& newVal)		\
 	{																	\
-		m_d##memberName## = newVal;										\
+		m_d##memberName = newVal;										\
 	}
 
 #define LINK_PROPERTY_BOOL_JS(memberName)								\
-	inline js_wrapper<bool> get_##memberName##()						\
+	inline js_wrapper<bool> get_##memberName()							\
 	{																	\
-		return m_b##memberName##;										\
+		return m_b##memberName;											\
 	}																	\
-	inline void put_##memberName##(const bool& newVal)					\
+	inline void put_##memberName(const bool& newVal)					\
 	{																	\
 		m_b##memberName## = newVal;										\
 	}																	\
-	inline void put_##memberName##(const js_wrapper<bool>& newVal)		\
+	inline void put_##memberName(const js_wrapper<bool>& newVal)		\
 	{																	\
-		m_b##memberName## = newVal;										\
+		m_b##memberName = newVal;										\
 	}
 
 #define LINK_PROPERTY_BYTE_JS(memberName)								\
-	inline js_wrapper<BYTE> get_##memberName##()						\
+	inline js_wrapper<BYTE> get_##memberName()							\
 	{																	\
-		return m_n##memberName##;										\
+		return m_n##memberName;											\
 	}																	\
-	inline void put_##memberName##(const BYTE& newVal)					\
+	inline void put_##memberName(const BYTE& newVal)					\
 	{																	\
-		m_n##memberName## = newVal;										\
+		m_n##memberName = newVal;										\
 	}																	\
-	inline void put_##memberName##(const js_wrapper<BYTE>& newVal)		\
+	inline void put_##memberName(const js_wrapper<BYTE>& newVal)		\
 	{																	\
-		m_n##memberName## = newVal;										\
+		m_n##memberName = newVal;										\
 	}
 
 #define LINK_PROPERTY_STRING_JS(memberName)									\
-	inline js_wrapper<std::wstring> get_##memberName##()					\
+	inline js_wrapper<std::wstring> get_##memberName()						\
 	{																		\
-		return m_s##memberName##;											\
+		return m_s##memberName;												\
 	}																		\
-	inline void put_##memberName##(const std::wstring& newVal)				\
+	inline void put_##memberName(const std::wstring& newVal)				\
 	{																		\
-		m_s##memberName## = newVal;											\
+		m_s##memberName = newVal;											\
 	}																		\
-	inline void put_##memberName##(const js_wrapper<std::wstring>& newVal)	\
+	inline void put_##memberName(const js_wrapper<std::wstring>& newVal)	\
 	{																		\
-		m_s##memberName## = newVal;											\
+		m_s##memberName = newVal;											\
 	}
 
 #define LINK_PROPERTY_STRINGA_JS(memberName)								\
-	inline js_wrapper<std::string> get_##memberName##()						\
+	inline js_wrapper<std::string> get_##memberName()						\
 	{																		\
-		return m_s##memberName##;											\
+		return m_s##memberName;												\
 	}																		\
-	inline void put_##memberName##(const std::string& newVal)				\
+	inline void put_##memberName(const std::string& newVal)					\
 	{																		\
-		m_s##memberName## = newVal;											\
+		m_s##memberName = newVal;											\
 	}																		\
-	inline void put_##memberName##(const js_wrapper<std::string>& newVal)	\
+	inline void put_##memberName(const js_wrapper<std::string>& newVal)		\
 	{																		\
-		m_s##memberName## = newVal;											\
+		m_s##memberName = newVal;											\
 	}
 
 #define LINK_PROPERTY_OBJECT_JS(objectType, memberName)						\
-	inline js_wrapper<##objectType##>& get_##memberName##()					\
+	inline js_wrapper<objectType>& get_##memberName()						\
 	{																		\
-		return m_o##memberName##;											\
+		return m_o##memberName;												\
 	}																		\
-	inline void put_##memberName##(const js_wrapper<##objectType##>& newVal)\
+	inline void put_##memberName(const js_wrapper<objectType>& newVal)		\
 	{																		\
-		m_o##memberName## = newVal;											\
+		m_o##memberName = newVal;											\
 	}																		\
-	inline void put_##memberName##(##objectType##* newVal)\
+	inline void put_##memberName(objectType* newVal)						\
 	{																		\
-		m_o##memberName## = newVal;											\
+		m_o##memberName = newVal;											\
 	}
 
 template<typename Type>