ubuntu build (not finished)

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

Common/DocxFormat/Source/Common/SimpleTypes_Shared.h

 #pragma once
 
 #include "SimpleTypes_Base.h"
+#include "SimpleTypes_Word.h"
 
 //      SharedML   Office Open Xml (22.8)
 namespace SimpleTypes

Common/DocxFormat/Source/Common/SimpleTypes_Word.h

@@ -3492,7 +3492,7 @@ namespace SimpleTypes
             else if ( _T("textFile")    == sValue ) this->m_eValue = mailmergeddatatypeTextFile;
             else if ( _T("xQuery")      == sValue ) this->m_eValue = mailmergeddatatypeXQuery;
             else if ( _T("xmlFile")     == sValue ) this->m_eValue = mailmergeddatatypeXmlFile;
-            else                                   this-> this->m_eValue = eDefValue;
+            else                                   this->m_eValue = eDefValue;
 
             return this->m_eValue;
 		}
@@ -5144,7 +5144,7 @@ namespace SimpleTypes
 			}
 			else
 			{
-				switch(m_eValue)
+                switch(this->m_eValue)
 				{
 				case stylesortBasedOn  : return _T("0004");
 				case stylesortDefault  : return _T("0002");

Common/DocxFormat/Source/DocxFormat/RId.h

@@ -50,12 +50,14 @@ namespace OOX
 			
 			return *this;
 		}
+#ifdef _WIN32
 		const RId& operator= (const BSTR& rid)
 		{
 			(*this) = (CString)rid;
 			
 			return *this;
 		}
+#endif
 		const RId& operator= (const RId& oSrc)
 		{
 			m_id = oSrc.m_id;