linux build

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

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -9,7 +9,7 @@ QT       -= core gui
 TARGET = DocxFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
-QMAKE_CXXFLAGS += -std=c++11
+QMAKE_CXXFLAGS += -std=c++11 -Wall
 
 DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_
 

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-09-12T16:51:23. -->
+<!-- Written by QtCreator 3.1.1, 2014-09-12T18:07:16. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>

Common/DocxFormat/Source/Base/ASCString.h

@@ -3915,6 +3915,8 @@ struct FmtArg<std::wstring>
 private:
     FmtArg<std::wstring>& operator=(const FmtArg<std::wstring>&) {return *this;}
 };
+
+/*
 template<>
 struct FmtArg<int>
 {
@@ -3942,6 +3944,7 @@ struct FmtArg<float>
 private:
     FmtArg<float>& operator=(const FmtArg<float>&) {return *this;}
 };
+
 template<>
 struct FmtArg<double>
 {
@@ -3951,6 +3954,17 @@ struct FmtArg<double>
 private:
     FmtArg<double>& operator=(const FmtArg<double>&) {return *this;}
 };
+*/
+/*
+template<>
+struct FmtArg<CUnsignedDecimalNumber>
+{
+    explicit FmtArg(const CUnsignedDecimalNumber& arg) : a_(arg) {}
+    const CUnsignedDecimalNumber& operator()() const { return a_; }
+    const CUnsignedDecimalNumber& a_;
+private:
+    FmtArg<CUnsignedDecimalNumber>& operator=(const FmtArg<CUnsignedDecimalNumber>&) {return *this;}
+};*/
 #endif // #ifdef SS_SAFEFORMAT
 
 #ifndef SS_ANSI

Common/DocxFormat/Source/Common/SimpleTypes_Shared.h

@@ -707,9 +707,15 @@ namespace SimpleTypes
 	public:
 		CUnsignedDecimalNumber() {}
 
+        CUnsignedDecimalNumber(const CUnsignedDecimalNumber& obj)
+        {
+            this->m_eValue = obj.m_eValue;
+
+        }
+
 		virtual unsigned int FromString(CString &sValue)
 		{
-            this->m_eValue = _wtoi( sValue );
+            this->m_eValue = _wtoi( sValue.c_str() );
 
             return this->m_eValue;
 		}
@@ -723,7 +729,7 @@ namespace SimpleTypes
 		}
 
 
-		SimpleType_FromString     (unsigned int)
+        SimpleType_FromString     (unsigned int)
 		SimpleType_Operator_Equal (CUnsignedDecimalNumber)
 	};
 

Common/DocxFormat/Source/DocxFormat/Comments.h

@@ -12,7 +12,7 @@
 #include "Logic/Sdt.h"
 #include "Logic/Table.h"
 #include "Math/oMathPara.h"
-#include "Math/oMath.h"
+#include "Math/OMath.h"
 
 namespace OOX
 {
@@ -618,4 +618,4 @@ namespace OOX
 
 } // namespace OOX
 
-#endif // OOX_COMMENTS_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_COMMENTS_FILE_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Document.h

@@ -19,9 +19,9 @@
 #include "Logic/Sdt.h"
 #include "Logic/Table.h"
 #include "Math/oMathPara.h"
-#include "Math/oMath.h"
+#include "Math/OMath.h"
 
-#include "External/Hyperlink.h"
+#include "External/HyperLink.h"
 
 namespace OOX
 {
@@ -584,4 +584,4 @@ namespace OOX
 
 } // namespace OOX
 
-#endif // OOX_DOCUMENT_FILE_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_DOCUMENT_FILE_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Docx.h

@@ -16,13 +16,13 @@
 #include "Styles.h"
 #include "Footnote.h"
 #include "Endnote.h"
-#include "Settings\WebSettings.h"
-#include "Settings\Settings.h"
-#include "External\HyperLink.h"
-#include "Media\Image.h"
-#include "Media\OleObject.h"
+#include "Settings/WebSettings.h"
+#include "Settings/Settings.h"
+#include "External/HyperLink.h"
+#include "Media/Image.h"
+#include "Media/OleObject.h"
 #include "HeaderFooter.h"
-#include "Theme\Theme.h"
+#include "Theme/Theme.h"
 
 namespace OOX
 {
@@ -183,4 +183,4 @@ namespace OOX
 	};
 } // OOX
 
-#endif // OOX_DOCX_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_DOCX_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Font.h

@@ -3,7 +3,7 @@
 #ifndef OOX_FONT_INCLUDE_H_
 #define OOX_FONT_INCLUDE_H_
 
-#include "../Base/nullable.h"
+#include "../Base/Nullable.h"
 #include "WritingElement.h"
 
 #include "../Common/SimpleTypes_Word.h"

Common/DocxFormat/Source/DocxFormat/FtnEdn.h

@@ -11,7 +11,7 @@
 #include "Logic/Sdt.h"
 #include "Logic/Table.h"
 #include "Math/oMathPara.h"
-#include "Math/oMath.h"
+#include "Math/OMath.h"
 
 // TO DO:  :
 //        <w:altChunk>
@@ -328,4 +328,4 @@ namespace OOX
 
 } // namespace OOX
 
-#endif // OOX_FTNEDN_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_FTNEDN_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/HeaderFooter.h

@@ -12,7 +12,7 @@
 #include "Logic/Sdt.h"
 #include "Logic/Table.h"
 #include "Math/oMathPara.h"
-#include "Math/oMath.h"
+#include "Math/OMath.h"
 
 // TO DO:  :
 //        <w:altChunk>
@@ -309,4 +309,4 @@ namespace OOX
 
 } // namespace OOX
 
-#endif // OOX_HEADER_FOOTER_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_HEADER_FOOTER_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Logic/Vml.cpp

@@ -992,12 +992,12 @@ namespace OOX
 			}
 			if(m_oRow.IsInit())
 			{
-				CString sRow;sRow.Format(_T("<x:Row>%d</x:Row>"), m_oRow.get());
+                CString sRow;sRow.Format(_T("<x:Row>%d</x:Row>"), m_oRow.get().GetValue());
 				sResult += sRow;
 			}
 			if(m_oColumn.IsInit())
 			{
-				CString sColumn;sColumn.Format(_T("<x:Column>%d</x:Column>"), m_oColumn.get());
+                CString sColumn;sColumn.Format(_T("<x:Column>%d</x:Column>"), m_oColumn.get().GetValue());
 				sResult += sColumn;
 			}
 			sResult = _T("</x:ClientData>");

Common/DocxFormat/Source/DocxFormat/Media/Media.h

@@ -2,8 +2,8 @@
 #ifndef OOX_MEDIA_INCLUDE_H_
 #define OOX_MEDIA_INCLUDE_H_
 
-#include "..\File.h"
-#include "..\FileTypes.h"
+#include "../File.h"
+#include "../FileTypes.h"
 
 #ifdef AVS_OFFICE_SVM_FILE
 #include "OfficeSvmFile.h"
@@ -69,4 +69,4 @@ namespace OOX
 	};
 } // namespace OOX
 
-#endif // OOX_MEDIA_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_MEDIA_INCLUDE_H_

Common/DocxFormat/Source/DocxFormat/Settings/WebSettings.h

@@ -2,8 +2,8 @@
 #ifndef OOX_WEBSETTINGS_INCLUDE_H_
 #define OOX_WEBSETTINGS_INCLUDE_H_
 
-#include "File.h"
-#include "../Common/ComplexTypes.h"
+#include "../File.h"
+#include "../../Common/ComplexTypes.h"
 
 namespace SimpleTypes
 {	
@@ -215,4 +215,4 @@ namespace OOX
 	};
 } // namespace OOX
 
-#endif // OOX_WEBSETTING_INCLDUE_H_
\ No newline at end of file
+#endif // OOX_WEBSETTING_INCLDUE_H_

Common/DocxFormat/Source/SystemUtility/File.h

 #pragma once
 
-#include "../XML/XmlUtils.h"
+#include "../XML/xmlutils.h"
 
 class CFile 
 {
@@ -671,4 +671,4 @@ namespace StreamUtils
 
 		StreamSeek((long)(ulPos.LowPart - lCount), pStream);
 	}
-}
\ No newline at end of file
+}

Common/DocxFormat/Source/XML/XmlSimple.h

 #pragma once
 
-#include "XmlUtils.h"
+#include "xmlutils.h"
 #include "../Base/Nullable.h"
 
 #include "../SystemUtility/File.h"