x2t - change projects

ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro

@@ -42,15 +42,15 @@ SOURCES += \
     ../../XlsxSerializerCom/Reader/CommonWriter.cpp \
     ../../XlsxSerializerCom/Reader/CSVReader.cpp \
     ../../XlsxSerializerCom/Writer/CSVWriter.cpp \
-    ../../OfficeCryptReader/source/ECMACryptReader.cpp \
-    ../../OfficeCryptReader/source/CryptTransform.cpp
+    ../../OfficeCryptReader/source/ECMACryptFile.cpp \
+    ../../OfficeCryptReader/source/CryptTransform.cpp \
+    ../BinReader/Readers.cpp
 
 HEADERS += ../DocWrapper/DocxSerializer.h \
     ../DocWrapper/FontProcessor.h \
     ../DocWrapper/XlsxSerializer.h \
     ../BinReader/ChartWriter.h \
     ../BinReader/CommentsWriter.h \
-    ../BinReader/ContentTypesWriter.h \
     ../BinReader/DocumentRelsWriter.h \
     ../BinReader/DocumentWriter.h \
     ../BinReader/FileWriter.h \
@@ -78,5 +78,5 @@ HEADERS += ../DocWrapper/DocxSerializer.h \
     ../../Common/FileDownloader/FileDownloader.h \
     ../BinReader/DefaultThemeWriter.h \
     ../DocWrapper/ChartWriter.h \
-    ../../OfficeCryptReader/source/ECMACryptReader.h \
+    ../../OfficeCryptReader/source/ECMACryptFile.h \
     ../../OfficeCryptReader/source/CryptTransform.h

ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro

@@ -98,16 +98,25 @@ SOURCES += \
     ../source/OdfFormat/text_elements.cpp \
     ../source/OdfFormat/odf_settings_context.cpp \
     ../source/OdfFormat/office_settings.cpp \
-    ../source/OdfFormat/mediaitems_utils.cpp
+    ../source/OdfFormat/mediaitems_utils.cpp \
+    ../source/OdfFormat/anim_elements.cpp \
+    ../source/OdfFormat/draw_page.cpp \
+    ../source/OdfFormat/logging.cpp \
+    ../source/OdfFormat/odp_conversion_context.cpp \
+    ../source/OdfFormat/odp_page_state.cpp \
+    ../source/OdfFormat/odp_slide_context.cpp \
+    ../source/OdfFormat/office_presentation.cpp \
+    ../source/OdfFormat/style_presentation.cpp \
 }
 
 SOURCES += \
-    ../source/Oox2OdfConverter/ConvertDiagram.cpp \
     ../source/Oox2OdfConverter/Converter.cpp \
     ../source/Oox2OdfConverter/ConverterChart.cpp \
     ../source/Oox2OdfConverter/ConvertVml.cpp \
     ../source/Oox2OdfConverter/DocxConverter.cpp \
-    ../source/Oox2OdfConverter/XlsxConverter.cpp
+    ../source/Oox2OdfConverter/XlsxConverter.cpp \
+    ../source/Oox2OdfConverter/ConvertDrawing.cpp \
+    ../source/Oox2OdfConverter/PptxConverter.cpp
 
 HEADERS += \
     ../source/OdfFormat/abstract_xml.h \
@@ -189,4 +198,13 @@ HEADERS += \
     ../source/OdfFormat/Shapes/oox_shapeStars.h \
     ../source/OdfFormat/Shapes/oox_shapeWordArt.h \
     ../source/OdfFormat/odf_settings_context.h \
-    ../source/OdfFormat/office_settings.h
+    ../source/OdfFormat/office_settings.h \
+    ../source/OdfFormat/anim_elements.h \
+    ../source/OdfFormat/draw_page.h \
+    ../source/OdfFormat/mediaitems_utils.h \
+    ../source/OdfFormat/odp_conversion_context.h \
+    ../source/OdfFormat/odp_page_state.h \
+    ../source/OdfFormat/odp_slide_context.h \
+    ../source/OdfFormat/office_presentation.h \
+    ../source/OdfFormat/style_presentation.h \
+    ../source/Oox2OdfConverter/PptxConverter.h

ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp

@@ -84,3 +84,11 @@
 #include "../source/OdfFormat/odf_settings_context.cpp"
 #include "../source/OdfFormat/office_settings.cpp"
 #include "../source/OdfFormat/mediaitems_utils.cpp"
+#include "../source/OdfFormat/anim_elements.cpp"
+#include "../source/OdfFormat/draw_page.cpp"
+#include "../source/OdfFormat/logging.cpp"
+#include "../source/OdfFormat/odp_conversion_context.cpp"
+#include "../source/OdfFormat/odp_page_state.cpp"
+#include "../source/OdfFormat/odp_slide_context.cpp"
+#include "../source/OdfFormat/office_presentation.cpp"
+#include "../source/OdfFormat/style_presentation.cpp"

ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro

@@ -497,7 +497,6 @@ HEADERS += pptxformatlib.h \
     ../../../Editor/DefaultNotesMaster.h \
     ../../../Editor/DefaultNotesTheme.h \
     ../../../../Common/DocxFormat/Source/Base/Nullable.h \
-    ../../../../Common/DocxFormat/Source/XML/xmlutils.h \
     ../../../../HtmlRenderer/include/ASCSVGWriter.h \
     ../../../../Common/FileDownloader/FileDownloader.h \
     ../../../PPTXFormat/ShowPr/Browse.h \

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -37,8 +37,6 @@ SOURCES += \
 
 core_debug {
 SOURCES += \
-    ../Source/DocxFormat/Drawing/DrawingCoreInfo.cpp \
-    ../Source/DocxFormat/Drawing/DrawingEffects.cpp \
     ../Source/DocxFormat/Logic/AlternateContent.cpp \
     ../Source/DocxFormat/Logic/Annotations.cpp \
     ../Source/DocxFormat/Logic/Bdo.cpp \
@@ -64,7 +62,6 @@ SOURCES += \
     ../Source/DocxFormat/FileFactory.cpp \
     ../Source/DocxFormat/IFileContainer.cpp \
     ../Source/XlsxFormat/FileFactory_Spreadsheet.cpp \
-    ../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp \
     ../Source/DocxFormat/Drawing/DrawingExt.cpp \
     ../Source/Common/Align.cpp \
     ../Source/Common/Color.cpp \
@@ -111,23 +108,8 @@ HEADERS += docxformatlib.h \
     ../Source/Common/Wrap.h \
     ../Source/Common/ZIndex.h \
     ../Source/DocxFormat/Drawing/Drawing.h \
-    ../Source/DocxFormat/Drawing/Drawing3D.h \
     ../Source/DocxFormat/Drawing/DrawingBody.h \
-    ../Source/DocxFormat/Drawing/DrawingColors.h \
-    ../Source/DocxFormat/Drawing/DrawingCoreInfo.h \
-    ../Source/DocxFormat/Drawing/DrawingEffects.h \
     ../Source/DocxFormat/Drawing/DrawingExt.h \
-    ../Source/DocxFormat/Drawing/DrawingGraphic.h \
-    ../Source/DocxFormat/Drawing/DrawingParagraph.h \
-    ../Source/DocxFormat/Drawing/DrawingParagraphElements.h \
-    ../Source/DocxFormat/Drawing/DrawingPicture.h \
-    ../Source/DocxFormat/Drawing/DrawingRun.h \
-    ../Source/DocxFormat/Drawing/DrawingShape.h \
-    ../Source/DocxFormat/Drawing/DrawingShared.h \
-    ../Source/DocxFormat/Drawing/DrawingStyles.h \
-    ../Source/DocxFormat/Drawing/DrawingStyles2.h \
-    ../Source/DocxFormat/Drawing/DrawingTables.h \
-    ../Source/DocxFormat/Drawing/DrawingTransform.h \
     ../Source/DocxFormat/External/External.h \
     ../Source/DocxFormat/External/ExternalAudio.h \
     ../Source/DocxFormat/External/ExternalImage.h \
@@ -167,8 +149,6 @@ HEADERS += docxformatlib.h \
     ../Source/DocxFormat/Media/Video.h \
     ../Source/DocxFormat/Settings/Settings.h \
     ../Source/DocxFormat/Settings/WebSettings.h \
-    ../Source/DocxFormat/Theme/Theme.h \
-    ../Source/DocxFormat/Theme/ThemeOverride.h \
     ../Source/DocxFormat/App.h \
     ../Source/DocxFormat/Bibliography.h \
     ../Source/DocxFormat/Comments.h \
@@ -198,11 +178,6 @@ HEADERS += docxformatlib.h \
     ../Source/DocxFormat/Unit.h \
     ../Source/DocxFormat/UnknowTypeFile.h \
     ../Source/DocxFormat/WritingElement.h \
-    ../Source/DocxFormat/WritingVector.h \
-    ../Source/SystemUtility/FileSystem/Directory.h \
-    ../Source/SystemUtility/FileSystem/File.h \
-    ../Source/SystemUtility/FileSystem/FileSystem.h \
-    ../Source/SystemUtility/FileSystem/Settings.h \
     ../Source/SystemUtility/SystemUtility.h \
     ../Source/Utility/codecvt.h \
     ../Source/Utility/DateTime.h \
@@ -216,10 +191,7 @@ HEADERS += docxformatlib.h \
     ../Source/XlsxFormat/Drawing/CellAnchor.h \
     ../Source/XlsxFormat/Drawing/Drawing.h \
     ../Source/XlsxFormat/Drawing/FromTo.h \
-    ../Source/XlsxFormat/Drawing/Image.h \
-    ../Source/XlsxFormat/Drawing/Pic.h \
     ../Source/XlsxFormat/Drawing/Pos.h \
-    ../Source/XlsxFormat/Drawing/Shape.h \
     ../Source/XlsxFormat/SharedStrings/PhoneticPr.h \
     ../Source/XlsxFormat/SharedStrings/rPr.h \
     ../Source/XlsxFormat/SharedStrings/Run.h \
@@ -256,16 +228,12 @@ HEADERS += docxformatlib.h \
     ../Source/XlsxFormat/ComplexTypes_Spreadsheet.h \
     ../Source/XlsxFormat/FileFactory_Spreadsheet.h \
     ../Source/XlsxFormat/FileTypes_Spreadsheet.h \
-    ../Source/XlsxFormat/IFileContainer_Spreadsheet.h \
     ../Source/XlsxFormat/SimpleTypes_Spreadsheet.h \
     ../Source/XlsxFormat/Workbook.h \
     ../Source/XlsxFormat/WritingElement.h \
     ../Source/XlsxFormat/Xlsx.h \
     ../Source/XML/Utils.h \
     ../Source/XML/XmlSimple.h \
-    ../Source/DocxFormat/Drawing/DrawingShapeElements.h \
-    ../Source/DocxFormat/Drawing/DrawingText.h \
-    ../Source/DocxFormat/Drawing/DrawingTextProperties.h \
     ../Source/MathEquation/LEStream.h \
     ../Source/MathEquation/MathEquation.h \
     ../Source/MathEquation/OutputDev.h \
@@ -277,4 +245,5 @@ HEADERS += docxformatlib.h \
     ../Source/XlsxFormat/ExternalLinks/ExternalLinks.h \
     ../Source/XlsxFormat/Worksheets/Sparkline.h \
     ../Source/XlsxFormat/Ole/OleObjects.h \
-    ../Source/DocxFormat/Diagram/DiagramData.h
+    ../Source/DocxFormat/Diagram/DiagramData.h \
+    ../Source/DocxFormat/Diagram/DiagramDrawing.h

Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp

@@ -30,8 +30,6 @@
  *
  */
 
-#include "../Source/DocxFormat/Drawing/DrawingCoreInfo.cpp"
-#include "../Source/DocxFormat/Drawing/DrawingEffects.cpp"
 #include "../Source/DocxFormat/Logic/AlternateContent.cpp"
 #include "../Source/DocxFormat/Logic/Annotations.cpp"
 #include "../Source/DocxFormat/Logic/Bdo.cpp"
@@ -57,7 +55,6 @@
 #include "../Source/DocxFormat/FileFactory.cpp"
 #include "../Source/DocxFormat/IFileContainer.cpp"
 #include "../Source/XlsxFormat/FileFactory_Spreadsheet.cpp"
-#include "../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp"
 #include "../Source/DocxFormat/Drawing/DrawingExt.cpp"
 #include "../Source/Common/Align.cpp"
 #include "../Source/Common/Color.cpp"

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.0.3.448
+VERSION = 2.0.4.448
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t