(2.0.1.327): ASCOfficeDocxFile2

TextFit default value

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

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//326
-#define INTVER 2,0,1,326
-#define STRVER "2,0,1,326\0"
+//327
+#define INTVER 2,0,1,327
+#define STRVER "2,0,1,327\0"

ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h

@@ -13,7 +13,10 @@ namespace PPTX
 		public:
 			enum eFit {FitEmpty = 0, FitNo = 1, FitSpAuto = 2, FitNormAuto = 3};
 
-			PPTX_LOGIC_BASE(TextFit)
+			TextFit(){
+				type = FitEmpty;
+			}
+			PPTX_LOGIC_BASE2(TextFit)
 			
 			virtual bool is_init(){return (type != FitEmpty);};
 

ASCOfficePPTXFile/PPTXFormat/WrapperWritingElement.h

@@ -24,6 +24,22 @@
     }																\
 	Class(const Class& oSrc) { *this = oSrc; }						\
 
+#define PPTX_LOGIC_BASE2(Class)										\
+	virtual ~Class() {}												\
+	explicit Class(XmlUtils::CXmlNode& node)	{ fromXML(node); }	\
+    explicit Class(const XmlUtils::CXmlNode& node)	{ fromXML(const_cast<XmlUtils::CXmlNode&> (node)); }	\
+    const Class& operator =(XmlUtils::CXmlNode& node)				\
+		{																\
+		fromXML(node);												\
+		return *this;												\
+		}																\
+    const Class& operator =(const XmlUtils::CXmlNode& node)				\
+	    {																\
+        fromXML(const_cast<XmlUtils::CXmlNode&> (node));												\
+        return *this;												\
+	    }																\
+	Class(const Class& oSrc) { *this = oSrc; }						\
+
 namespace PPTX
 {
 	class WrapperWritingElement : public PPTX::WritingElement