x2t linux build исправления в связи с новой структурой папок

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -344,7 +344,12 @@ SOURCES += \
 
 SOURCES += \
     ../formulasconvert/formulasconvert_odf.cpp \
-    ../formulasconvert/formulasconvert_oox.cpp
+    ../formulasconvert/formulasconvert_oox.cpp \
+    ../src/odf/math_elementaries.cpp \
+    ../src/odf/math_layout_elements.cpp \
+    ../src/odf/math_limit_elements.cpp \
+    ../src/odf/math_table_elements.cpp \
+    ../src/odf/math_token_elements.cpp
 
 HEADERS += \
     ../formulasconvert/formulasconvert.h \
@@ -606,7 +611,12 @@ HEADERS += \
     ../include/cpdoccore/xml/xmlchar.h \
     ../include/cpdoccore/xml/xmlelement.h \
     ../src/ConvertOO2OOX.h \
-    ../src/odf/math_elements.h
+    ../src/odf/math_elements.h \
+    ../src/odf/math_elementaries.h \
+    ../src/odf/math_layout_elements.h \
+    ../src/odf/math_limit_elements.h \
+    ../src/odf/math_table_elements.h \
+    ../src/odf/math_token_elements.h
 unix {
     target.path = /usr/lib
     INSTALLS += target

ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro

@@ -1772,7 +1772,9 @@ HEADERS +=  \
     ../XlsXlsxConverter/ConvertShapes/XmlWriter.h \
     ../XlsXlsxConverter/ConvertShapes/CustomShape.h \
     ../XlsFormat/Logic/Biff_structures/AFDOperBoolErr.h \
-    ../XlsFormat/Logic/Biff_structures/AFDOperXNum.h
+    ../XlsFormat/Logic/Biff_structures/AFDOperXNum.h \
+    ../XlsFormat/Logic/Biff_unions/IMDATAOBJECT.h \
+    ../XlsFormat/Logic/Biff_records/IMDATA.h
 
 
 
@@ -1781,3 +1783,7 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
+
+SOURCES += \
+    ../XlsFormat/Logic/Biff_unions/IMDATAOBJECT.cpp \
+    ../XlsFormat/Logic/Biff_records/IMDATA.cpp

X2tConverter/src/main.cpp

@@ -4,7 +4,6 @@
 
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 #include "../../DesktopEditor/common/Directory.h"
-#include "../../DesktopEditor/doctrenderer/docbuilder.h"
 
 //#include <iostream>
 
@@ -414,8 +413,5 @@ int main(int argc, char *argv[])
 	// delete temp dir
     NSDirectory::DeleteDirectory(sTempDir);
 
-	//clean up v8
-	NSDoctRenderer::CDocBuilder::Dispose();
-
     return getReturnErrorCode(result);
 }