linux build

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

ASCOfficePPTXFile/Editor/BinWriters.h

@@ -3,9 +3,9 @@
 #include "BinReaderWriterDefines.h"
 
 #include "../../Common/Base64.h"
-#include "ImageManager.h"
+#include "imagemanager.h"
 #include "./XmlWriter.h"
 #include "../PPTXFormat/FileContainer.h"
 #include "../PPTXFormat/DocxFormat/WritingElement.h"
 #include "../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h"
-#include "BinaryFileReaderWriter.h"
\ No newline at end of file
+#include "BinaryFileReaderWriter.h"

ASCOfficePPTXFile/PPTXFormat/DocxFormat/Rels/RelationShip.h

@@ -77,7 +77,7 @@ namespace PPTX
 			{
 				if (!m_mode.IsInit())
 					return false;
-				return (*m_mode == "External");
+                return (*m_mode == _T("External"));
 			}
 			const RId rId() const
 			{
@@ -93,4 +93,4 @@ namespace PPTX
 	} // namespace Rels
 } // namespace PPTX
 
-#endif // OOX_RELS_RELATION_SHIP_INCLUDE_H_
\ No newline at end of file
+#endif // OOX_RELS_RELATION_SHIP_INCLUDE_H_

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -10,7 +10,7 @@ TARGET = PPTXFormatLib
 TEMPLATE = lib
 CONFIG += staticlib
 QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers -g
-DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_
+DEFINES += UNICODE _UNICODE _USE_LIBXML2_READER_ _LINUX_QT _USE_XMLLITE_READER_ NODOCX
 
 INCLUDEPATH += \
     /usr/include/libxml2