x2t - refactoring qt projects

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -34,21 +34,15 @@ CONFIG(debug, debug|release){
 DEFINES +=  _DEBUG
 }
 
-build_fast {
+core_release {
 SOURCES += \
+    odffilereaderlib_odf_datatypes.cpp \
     odffilereaderlib_odf.cpp \
-    odffilereaderlib_docx.cpp \
-    odffilereaderlib_pptx.cpp \
-    odffilereaderlib_xlsx.cpp \
-    odffilereaderlib_converter.cpp
-} else {
+    odffilereaderlib_oox.cpp
+}
+
+core_debug {
 SOURCES += \    
-    ../src/conversionelement.cpp \
-    ../src/xml/attributes.cpp \
-    ../src/xml/sax.cpp \
-    ../src/xml/sax_xmllite.cpp \
-    ../src/xml/utils.cpp \
-    ../src/xml/xmlchar.cpp \
     ../src/odf/abstract_xml.cpp \
     ../src/odf/anim_elements.cpp \
     ../src/odf/calcs_styles.cpp \
@@ -114,6 +108,15 @@ SOURCES += \
     ../src/odf/templates.cpp \
     ../src/odf/text_content.cpp \
     ../src/odf/text_elements.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 \
+    ../src/odf/datatypes/mathvariant.cpp \
+    ../src/odf/calcext_elements.cpp \
+    ../src/odf/table_database_ranges.cpp \
+    ../src/odf/math_elements.cpp \
     ../src/odf/datatypes/anchortype.cpp \
     ../src/odf/datatypes/backgroundcolor.cpp \
     ../src/odf/datatypes/bool.cpp \
@@ -204,6 +207,8 @@ SOURCES += \
     ../src/odf/datatypes/wrapoption.cpp \
     ../src/odf/datatypes/writingmode.cpp \
     ../src/odf/datatypes/xlink.cpp \
+    ../src/docx/xlsx_conditionalFormatting.cpp \
+    ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
     ../src/docx/docx_conversion_context.cpp \
     ../src/docx/docx_drawing.cpp \
@@ -272,27 +277,22 @@ SOURCES += \
     ../src/docx/xlsx_table_state.cpp \
     ../src/docx/xlsx_textcontext.cpp \
     ../src/docx/xlsx_utils.cpp \
-    ../src/docx/xlsx_xf.cpp \
-    ../src/common/CPColorUtils.cpp \
-    ../src/common/CPString.cpp \
-    ../src/common/readdocelement.cpp \
-    ../src/ConvertOO2OOX.cpp \
-    ../src/odf/math_elements.cpp
+    ../src/docx/xlsx_xf.cpp
 }
 
 SOURCES += \
     ../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 \
-    ../src/odf/datatypes/mathvariant.cpp \
     ../formulasconvert/formulasconvert_odf.cpp \
-    ../src/odf/calcext_elements.cpp \
-    ../src/odf/table_database_ranges.cpp \
-    ../src/docx/xlsx_conditionalFormatting.cpp \
-    ../src/docx/xlsx_dxfs.cpp
+    ../src/conversionelement.cpp \
+    ../src/xml/attributes.cpp \
+    ../src/xml/sax.cpp \
+    ../src/xml/sax_xmllite.cpp \
+    ../src/xml/utils.cpp \
+    ../src/xml/xmlchar.cpp \
+    ../src/common/CPColorUtils.cpp \
+    ../src/common/CPString.cpp \
+    ../src/common/readdocelement.cpp \
+    ../src/ConvertOO2OOX.cpp
 
 HEADERS += \
     ../formulasconvert/formulasconvert.h \
@@ -357,6 +357,16 @@ HEADERS += \
     ../src/odf/text_content.h \
     ../src/odf/text_elements.h \
     ../src/odf/visitor.h \
+    ../src/ConvertOO2OOX.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 \
+    ../src/odf/datatypes/mathvariant.h \
+    ../src/odf/calcext_elements.h \
+    ../src/odf/table_database_ranges.h \
     ../src/odf/datatypes/anchortype.h \
     ../src/odf/datatypes/backgroundcolor.h \
     ../src/odf/datatypes/bool.h \
@@ -456,6 +466,8 @@ HEADERS += \
     ../src/docx/docx_drawing.h \
     ../src/docx/docx_package.h \
     ../src/docx/docx_table_context.h \
+    ../src/docx/xlsx_conditionalFormatting.h \
+    ../src/docx/xlsx_dxfs.h \
     ../src/docx/drawing_object_description.h \
     ../src/docx/headers_footers.h \
     ../src/docx/hyperlinks.h \
@@ -551,16 +563,5 @@ HEADERS += \
     ../include/cpdoccore/xml/simple_xml_writer.h \
     ../include/cpdoccore/xml/utils.h \
     ../include/cpdoccore/xml/xmlchar.h \
-    ../include/cpdoccore/xml/xmlelement.h \
-    ../src/ConvertOO2OOX.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 \
-    ../src/odf/datatypes/mathvariant.h \
-    ../src/odf/calcext_elements.h \
-    ../src/odf/table_database_ranges.h \
-    ../src/docx/xlsx_conditionalFormatting.h \
-    ../src/docx/xlsx_dxfs.h
+    ../include/cpdoccore/xml/xmlelement.h
+

ASCOfficeOdfFile/linux/odffilereaderlib_converter.cpp

-/*
- * (c) Copyright Ascensio System SIA 2010-2016
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#include "../src/conversionelement.cpp"
-#include "../src/xml/attributes.cpp"
-#include "../src/xml/sax.cpp"
-#include "../src/xml/sax_xmllite.cpp"
-#include "../src/xml/utils.cpp"
-#include "../src/xml/xmlchar.cpp"
-#include "../src/common/CPColorUtils.cpp"
-#include "../src/common/CPString.cpp"
-#include "../src/common/readdocelement.cpp"
-#include "../src/ConvertOO2OOX.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_docx.cpp

-/*
- * (c) Copyright Ascensio System SIA 2010-2016
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#include "../src/docx/docx_content_type.cpp"
-#include "../src/docx/docx_conversion_context.cpp"
-#include "../src/docx/docx_drawing.cpp"
-#include "../src/docx/docx_package.cpp"
-#include "../src/docx/docx_rels.cpp"
-#include "../src/docx/docx_table_context.cpp"
-#include "../src/docx/headers_footers.cpp"
-#include "../src/docx/hyperlinks.cpp"
-#include "../src/docx/measuredigits.cpp"
-#include "../src/docx/mediaitems.cpp"
-#include "../src/docx/mediaitems_utils.cpp"
-#include "../src/docx/namespaces.cpp"
-#include "../src/docx/oox_chart_axis.cpp"
-#include "../src/docx/oox_chart_context.cpp"
-#include "../src/docx/oox_chart_legend.cpp"
-#include "../src/docx/oox_chart_series.cpp"
-#include "../src/docx/oox_chart_shape.cpp"
-#include "../src/docx/oox_conversion_context.cpp"
-#include "../src/docx/oox_data_labels.cpp"
-#include "../src/docx/oox_drawing.cpp"
-#include "../src/docx/oox_drawing_fills.cpp"
-#include "../src/docx/oox_layout.cpp"
-#include "../src/docx/oox_package.cpp"
-#include "../src/docx/oox_plot_area.cpp"
-#include "../src/docx/oox_title.cpp"
-#include "../src/docx/oox_types_chart.cpp"
-#include "../src/odf/draw_frame_docx.cpp"
-#include "../src/odf/draw_shapes_docx.cpp"
-#include "../src/odf/style_paragraph_properties_docx.cpp"
-#include "../src/odf/table_docx.cpp"
\ No newline at end of file

ASCOfficeOdfFile/linux/odffilereaderlib_odf.cpp

@@ -37,8 +37,14 @@
 #include "../src/odf/documentcontext.cpp"
 #include "../src/odf/draw_common.cpp"
 #include "../src/odf/draw_frame.cpp"
+#include "../src/odf/draw_frame_docx.cpp"
+#include "../src/odf/draw_frame_pptx.cpp"
+#include "../src/odf/draw_frame_xlsx.cpp"
 #include "../src/odf/draw_page.cpp"
 #include "../src/odf/draw_shapes.cpp"
+#include "../src/odf/draw_shapes_docx.cpp"
+#include "../src/odf/draw_shapes_pptx.cpp"
+#include "../src/odf/draw_shapes_xlsx.cpp"
 #include "../src/odf/font_face.cpp"
 #include "../src/odf/header_footer.cpp"
 #include "../src/odf/list.cpp"
@@ -48,7 +54,6 @@
 #include "../src/odf/odf_content_xml.cpp"
 #include "../src/odf/odfcontext.cpp"
 #include "../src/odf/odf_document.cpp"
-#include "../src/odf/odf_document_impl.cpp"
 #include "../src/odf/office_annotation.cpp"
 #include "../src/odf/office_binary_data.cpp"
 #include "../src/odf/office_body.cpp"
@@ -69,6 +74,8 @@
 #include "../src/odf/style_graphic_properties.cpp"
 #include "../src/odf/style_map.cpp"
 #include "../src/odf/style_paragraph_properties.cpp"
+#include "../src/odf/style_paragraph_properties_docx.cpp"
+#include "../src/odf/style_paragraph_properties_pptx.cpp"
 #include "../src/odf/style_presentation.cpp"
 #include "../src/odf/style_regions.cpp"
 #include "../src/odf/styles.cpp"
@@ -79,98 +86,20 @@
 #include "../src/odf/svg_parser.cpp"
 #include "../src/odf/table.cpp"
 #include "../src/odf/table_calculation_settings.cpp"
+#include "../src/odf/table_docx.cpp"
 #include "../src/odf/table_named_expressions.cpp"
+#include "../src/odf/table_pptx.cpp"
+#include "../src/odf/table_xlsx.cpp"
 #include "../src/odf/templates.cpp"
 #include "../src/odf/text_content.cpp"
 #include "../src/odf/text_elements.cpp"
-#include "../src/odf/datatypes/anchortype.cpp"
-#include "../src/odf/datatypes/backgroundcolor.cpp"
-#include "../src/odf/datatypes/bool.cpp"
-#include "../src/odf/datatypes/bordermodel.cpp"
-#include "../src/odf/datatypes/borderstyle.cpp"
-#include "../src/odf/datatypes/borderwidths.cpp"
-#include "../src/odf/datatypes/calcext_type.cpp"
-#include "../src/odf/datatypes/chartdatalabelnumber.cpp"
-#include "../src/odf/datatypes/charterrorcategory.cpp"
-#include "../src/odf/datatypes/chartinterpolation.cpp"
-#include "../src/odf/datatypes/chartlabelarrangement.cpp"
-#include "../src/odf/datatypes/chartregressiontype.cpp"
-#include "../src/odf/datatypes/chartseriessource.cpp"
-#include "../src/odf/datatypes/chartsolidtype.cpp"
-#include "../src/odf/datatypes/chartsymbol.cpp"
-#include "../src/odf/datatypes/clockvalue.cpp"
-#include "../src/odf/datatypes/color.cpp"
-#include "../src/odf/datatypes/common_attlists.cpp"
-#include "../src/odf/datatypes/direction.cpp"
-#include "../src/odf/datatypes/drawfill.cpp"
-#include "../src/odf/datatypes/dropcaplength.cpp"
-#include "../src/odf/datatypes/fillimagerefpoint.cpp"
-#include "../src/odf/datatypes/fobreak.cpp"
-#include "../src/odf/datatypes/fontfamilygeneric.cpp"
-#include "../src/odf/datatypes/fontpitch.cpp"
-#include "../src/odf/datatypes/fontrelief.cpp"
-#include "../src/odf/datatypes/fontsize.cpp"
-#include "../src/odf/datatypes/fontstretch.cpp"
-#include "../src/odf/datatypes/fontstyle.cpp"
-#include "../src/odf/datatypes/fontvariant.cpp"
-#include "../src/odf/datatypes/fontweight.cpp"
-#include "../src/odf/datatypes/gradientstyle.cpp"
-#include "../src/odf/datatypes/hatchstyle.cpp"
-#include "../src/odf/datatypes/hyphenationkeep.cpp"
-#include "../src/odf/datatypes/hyphenationladdercount.cpp"
-#include "../src/odf/datatypes/iconset_type.cpp"
-#include "../src/odf/datatypes/keeptogether.cpp"
-#include "../src/odf/datatypes/layoutgridmode.cpp"
-#include "../src/odf/datatypes/length.cpp"
-#include "../src/odf/datatypes/lengthorpercent.cpp"
-#include "../src/odf/datatypes/letterspacing.cpp"
-#include "../src/odf/datatypes/linebreak.cpp"
-#include "../src/odf/datatypes/linemode.cpp"
-#include "../src/odf/datatypes/linestyle.cpp"
-#include "../src/odf/datatypes/linetype.cpp"
-#include "../src/odf/datatypes/linewidth.cpp"
-#include "../src/odf/datatypes/markerstyle.cpp"
-#include "../src/odf/datatypes/noteclass.cpp"
-#include "../src/odf/datatypes/officevaluetype.cpp"
-#include "../src/odf/datatypes/pageusage.cpp"
-#include "../src/odf/datatypes/percent.cpp"
-#include "../src/odf/datatypes/percentorscale.cpp"
-#include "../src/odf/datatypes/presentationclass.cpp"
-#include "../src/odf/datatypes/punctuationwrap.cpp"
-#include "../src/odf/datatypes/rotationalign.cpp"
-#include "../src/odf/datatypes/runthrough.cpp"
-#include "../src/odf/datatypes/scripttype.cpp"
-#include "../src/odf/datatypes/shadowtype.cpp"
-#include "../src/odf/datatypes/smil_transitiontype.cpp"
-#include "../src/odf/datatypes/stylefamily.cpp"
-#include "../src/odf/datatypes/stylehorizontalpos.cpp"
-#include "../src/odf/datatypes/stylehorizontalrel.cpp"
-#include "../src/odf/datatypes/styleleadercolor.cpp"
-#include "../src/odf/datatypes/styleposition.cpp"
-#include "../src/odf/datatypes/style_ref.cpp"
-#include "../src/odf/datatypes/stylerepeat.cpp"
-#include "../src/odf/datatypes/styletype.cpp"
-#include "../src/odf/datatypes/styleverticalpos.cpp"
-#include "../src/odf/datatypes/styleverticalrel.cpp"
-#include "../src/odf/datatypes/stylewrap.cpp"
-#include "../src/odf/datatypes/stylewrapcontourmode.cpp"
-#include "../src/odf/datatypes/tablealign.cpp"
-#include "../src/odf/datatypes/tablecentering.cpp"
-#include "../src/odf/datatypes/tablemode.cpp"
-#include "../src/odf/datatypes/tablevisibility.cpp"
-#include "../src/odf/datatypes/targetframename.cpp"
-#include "../src/odf/datatypes/textalign.cpp"
-#include "../src/odf/datatypes/textalignsource.cpp"
-#include "../src/odf/datatypes/textautospace.cpp"
-#include "../src/odf/datatypes/textcombine.cpp"
-#include "../src/odf/datatypes/textdisplay.cpp"
-#include "../src/odf/datatypes/textemphasize.cpp"
-#include "../src/odf/datatypes/textposition.cpp"
-#include "../src/odf/datatypes/textrotationscale.cpp"
-#include "../src/odf/datatypes/texttransform.cpp"
-#include "../src/odf/datatypes/underlinecolor.cpp"
-#include "../src/odf/datatypes/verticalalign.cpp"
-#include "../src/odf/datatypes/wrapoption.cpp"
-#include "../src/odf/datatypes/writingmode.cpp"
-#include "../src/odf/datatypes/xlink.cpp"
+#include "../src/odf/math_elementaries.cpp"
+#include "../src/odf/math_layout_elements.cpp"
+#include "../src/odf/math_limit_elements.cpp"
+#include "../src/odf/math_table_elements.cpp"
+#include "../src/odf/math_token_elements.cpp"
+#include "../src/odf/datatypes/mathvariant.cpp"
+#include "../src/odf/calcext_elements.cpp"
+#include "../src/odf/table_database_ranges.cpp"
 #include "../src/odf/math_elements.cpp"
+#include "../src/odf/odf_document_impl.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

+/*
+ * (c) Copyright Ascensio System SIA 2010-2016
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#include "../src/odf/datatypes/anchortype.cpp"
+#include "../src/odf/datatypes/backgroundcolor.cpp"
+#include "../src/odf/datatypes/bool.cpp"
+#include "../src/odf/datatypes/bordermodel.cpp"
+#include "../src/odf/datatypes/borderstyle.cpp"
+#include "../src/odf/datatypes/borderwidths.cpp"
+#include "../src/odf/datatypes/calcext_type.cpp"
+#include "../src/odf/datatypes/chartdatalabelnumber.cpp"
+#include "../src/odf/datatypes/charterrorcategory.cpp"
+#include "../src/odf/datatypes/chartinterpolation.cpp"
+#include "../src/odf/datatypes/chartlabelarrangement.cpp"
+#include "../src/odf/datatypes/chartregressiontype.cpp"
+#include "../src/odf/datatypes/chartseriessource.cpp"
+#include "../src/odf/datatypes/chartsolidtype.cpp"
+#include "../src/odf/datatypes/chartsymbol.cpp"
+#include "../src/odf/datatypes/clockvalue.cpp"
+#include "../src/odf/datatypes/color.cpp"
+#include "../src/odf/datatypes/common_attlists.cpp"
+#include "../src/odf/datatypes/direction.cpp"
+#include "../src/odf/datatypes/drawfill.cpp"
+#include "../src/odf/datatypes/dropcaplength.cpp"
+#include "../src/odf/datatypes/fillimagerefpoint.cpp"
+#include "../src/odf/datatypes/fobreak.cpp"
+#include "../src/odf/datatypes/fontfamilygeneric.cpp"
+#include "../src/odf/datatypes/fontpitch.cpp"
+#include "../src/odf/datatypes/fontrelief.cpp"
+#include "../src/odf/datatypes/fontsize.cpp"
+#include "../src/odf/datatypes/fontstretch.cpp"
+#include "../src/odf/datatypes/fontstyle.cpp"
+#include "../src/odf/datatypes/fontvariant.cpp"
+#include "../src/odf/datatypes/fontweight.cpp"
+#include "../src/odf/datatypes/gradientstyle.cpp"
+#include "../src/odf/datatypes/hatchstyle.cpp"
+#include "../src/odf/datatypes/hyphenationkeep.cpp"
+#include "../src/odf/datatypes/hyphenationladdercount.cpp"
+#include "../src/odf/datatypes/iconset_type.cpp"
+#include "../src/odf/datatypes/keeptogether.cpp"
+#include "../src/odf/datatypes/layoutgridmode.cpp"
+#include "../src/odf/datatypes/length.cpp"
+#include "../src/odf/datatypes/lengthorpercent.cpp"
+#include "../src/odf/datatypes/letterspacing.cpp"
+#include "../src/odf/datatypes/linebreak.cpp"
+#include "../src/odf/datatypes/linemode.cpp"
+#include "../src/odf/datatypes/linestyle.cpp"
+#include "../src/odf/datatypes/linetype.cpp"
+#include "../src/odf/datatypes/linewidth.cpp"
+#include "../src/odf/datatypes/markerstyle.cpp"
+#include "../src/odf/datatypes/noteclass.cpp"
+#include "../src/odf/datatypes/officevaluetype.cpp"
+#include "../src/odf/datatypes/pageusage.cpp"
+#include "../src/odf/datatypes/percent.cpp"
+#include "../src/odf/datatypes/percentorscale.cpp"
+#include "../src/odf/datatypes/presentationclass.cpp"
+#include "../src/odf/datatypes/punctuationwrap.cpp"
+#include "../src/odf/datatypes/rotationalign.cpp"
+#include "../src/odf/datatypes/runthrough.cpp"
+#include "../src/odf/datatypes/scripttype.cpp"
+#include "../src/odf/datatypes/shadowtype.cpp"
+#include "../src/odf/datatypes/smil_transitiontype.cpp"
+#include "../src/odf/datatypes/stylefamily.cpp"
+#include "../src/odf/datatypes/stylehorizontalpos.cpp"
+#include "../src/odf/datatypes/stylehorizontalrel.cpp"
+#include "../src/odf/datatypes/styleleadercolor.cpp"
+#include "../src/odf/datatypes/styleposition.cpp"
+#include "../src/odf/datatypes/style_ref.cpp"
+#include "../src/odf/datatypes/stylerepeat.cpp"
+#include "../src/odf/datatypes/styletype.cpp"
+#include "../src/odf/datatypes/styleverticalpos.cpp"
+#include "../src/odf/datatypes/styleverticalrel.cpp"
+#include "../src/odf/datatypes/stylewrap.cpp"
+#include "../src/odf/datatypes/stylewrapcontourmode.cpp"
+#include "../src/odf/datatypes/tablealign.cpp"
+#include "../src/odf/datatypes/tablecentering.cpp"
+#include "../src/odf/datatypes/tablemode.cpp"
+#include "../src/odf/datatypes/tablevisibility.cpp"
+#include "../src/odf/datatypes/targetframename.cpp"
+#include "../src/odf/datatypes/textalign.cpp"
+#include "../src/odf/datatypes/textalignsource.cpp"
+#include "../src/odf/datatypes/textautospace.cpp"
+#include "../src/odf/datatypes/textcombine.cpp"
+#include "../src/odf/datatypes/textdisplay.cpp"
+#include "../src/odf/datatypes/textemphasize.cpp"
+#include "../src/odf/datatypes/textposition.cpp"
+#include "../src/odf/datatypes/textrotationscale.cpp"
+#include "../src/odf/datatypes/texttransform.cpp"
+#include "../src/odf/datatypes/underlinecolor.cpp"
+#include "../src/odf/datatypes/verticalalign.cpp"
+#include "../src/odf/datatypes/wrapoption.cpp"
+#include "../src/odf/datatypes/writingmode.cpp"
+#include "../src/odf/datatypes/xlink.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_xlsx.cpp → ASCOfficeOdfFile/linux/odffilereaderlib_oox.cpp

@@ -29,10 +29,43 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#include "../src/docx/xlsx_utils.cpp"
-#include "../src/odf/draw_frame_xlsx.cpp"
-#include "../src/odf/draw_shapes_xlsx.cpp"
-#include "../src/odf/table_xlsx.cpp"
+#include "../src/docx/xlsx_conditionalFormatting.cpp"
+#include "../src/docx/xlsx_dxfs.cpp"
+#include "../src/docx/docx_content_type.cpp"
+#include "../src/docx/docx_conversion_context.cpp"
+#include "../src/docx/docx_drawing.cpp"
+#include "../src/docx/docx_package.cpp"
+#include "../src/docx/docx_table_context.cpp"
+#include "../src/docx/headers_footers.cpp"
+#include "../src/docx/hyperlinks.cpp"
+#include "../src/docx/measuredigits.cpp"
+#include "../src/docx/mediaitems.cpp"
+#include "../src/docx/namespaces.cpp"
+#include "../src/docx/oox_chart_axis.cpp"
+#include "../src/docx/oox_chart_context.cpp"
+#include "../src/docx/oox_chart_legend.cpp"
+#include "../src/docx/oox_chart_series.cpp"
+#include "../src/docx/oox_chart_shape.cpp"
+#include "../src/docx/oox_conversion_context.cpp"
+#include "../src/docx/oox_data_labels.cpp"
+#include "../src/docx/oox_drawing.cpp"
+#include "../src/docx/oox_drawing_fills.cpp"
+#include "../src/docx/oox_layout.cpp"
+#include "../src/docx/oox_package.cpp"
+#include "../src/docx/oox_plot_area.cpp"
+#include "../src/docx/oox_title.cpp"
+#include "../src/docx/oox_types_chart.cpp"
+#include "../src/docx/oox_rels.cpp"
+#include "../src/docx/pptx_comments.cpp"
+#include "../src/docx/pptx_comments_context.cpp"
+#include "../src/docx/pptx_conversion_context.cpp"
+#include "../src/docx/pptx_drawing.cpp"
+#include "../src/docx/pptx_drawings.cpp"
+#include "../src/docx/pptx_output_xml.cpp"
+#include "../src/docx/pptx_package.cpp"
+#include "../src/docx/pptx_slide_context.cpp"
+#include "../src/docx/pptx_table_context.cpp"
+#include "../src/docx/pptx_text_context.cpp"
 #include "../src/docx/xlsx_alignment.cpp"
 #include "../src/docx/xlsx_border.cpp"
 #include "../src/docx/xlsx_borders.cpp"
@@ -65,4 +98,5 @@
 #include "../src/docx/xlsx_table_metrics.cpp"
 #include "../src/docx/xlsx_table_state.cpp"
 #include "../src/docx/xlsx_textcontext.cpp"
+#include "../src/docx/xlsx_utils.cpp"
 #include "../src/docx/xlsx_xf.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_pptx.cpp

-/*
- * (c) Copyright Ascensio System SIA 2010-2016
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
- * EU, LV-1021.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#include "../src/odf/draw_frame_pptx.cpp"
-#include "../src/odf/draw_shapes_pptx.cpp"
-#include "../src/odf/style_paragraph_properties_pptx.cpp"
-#include "../src/odf/table_pptx.cpp"
-#include "../src/docx/pptx_comments.cpp"
-#include "../src/docx/pptx_comments_context.cpp"
-#include "../src/docx/pptx_conversion_context.cpp"
-#include "../src/docx/pptx_drawing.cpp"
-#include "../src/docx/pptx_drawings.cpp"
-#include "../src/docx/pptx_output_xml.cpp"
-#include "../src/docx/pptx_package.cpp"
-#include "../src/docx/pptx_slide_context.cpp"
-#include "../src/docx/pptx_table_context.cpp"
-#include "../src/docx/pptx_text_context.cpp"
\ No newline at end of file

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

@@ -38,24 +38,9 @@ namespace cpdoccore {
 
 namespace oox {
 
-static const int _odf_to_docx_ShapeType[]=
-{ 4,4,4,34,};
-
-static const std::wstring _docxShapeType[]=
-{
-	L"rect", 
-	L"rect", 
-	L"rect", 
-	L"ellipse", 
-	L"ellipse", 
-	L"line", 
-	L"custGeom"
-};
-
 
 namespace {
 
-
 }
 void serialize_wrap_top_bottom(std::wostream & strm,  _docx_drawing const & val)
 {

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

@@ -38,20 +38,6 @@ namespace cpdoccore {
 
 namespace oox {
 
-static const int _odf_to_docx_ShapeType[]=
-{ 4,4,4,34,};
-
-static const std::wstring _docxShapeType[]=
-{
-	L"rect", 
-	L"rect", 
-	L"rect", 
-	L"ellipse", 
-	L"ellipse", 
-	L"line", 
-	L"custGeom"
-};
-
 void pptx_serialize_text(std::wostream & strm, _pptx_drawing & val)
 {
 	_CP_OPT(std::wstring) strTextContent;

ASCOfficeOdfFile/src/docx/xlsx_utils.cpp

@@ -188,9 +188,7 @@ std::wstring cellType2Str(XlsxCellType::type type)
 
 boost::int64_t convertDate(int Year, int Month, int Day)
 {
-    using namespace boost::gregorian;
-
-    boost::int64_t daysFrom1900  =  date_duration(date(Year, Month, Day) - date(1900, 1, 1)).days() + 1;
+    boost::int64_t daysFrom1900  =  boost::gregorian::date_duration(boost::gregorian::date(Year, Month, Day) - boost::gregorian::date(1900, 1, 1)).days() + 1;
 
     if (Year <= 1900 && 
         Month <= 2 &&

ASCOfficeOdfFile/src/odf/odf_document_impl.cpp

@@ -85,6 +85,7 @@
 #include "documentcontext.h"
 
 #include "../progressCallback.h"
+
 #define PROGRESSEVENT_ID 0
 
 namespace cpdoccore { 
@@ -146,6 +147,7 @@ odf_document::Impl::Impl(const std::wstring & folderPath, const ProgressCallback
 
 	UpdateProgress(400000);
 }
+
 bool odf_document::Impl::UpdateProgress(long nComplete)
 {
 	if (pCallBack)
@@ -160,6 +162,7 @@ bool odf_document::Impl::UpdateProgress(long nComplete)
 
 	return false;
 }
+
 void odf_document::Impl::parse_fonts()
 {
     do 

ASCOfficeOdfFile/src/odf/style_paragraph_properties_docx.cpp

@@ -110,7 +110,7 @@ std::wstring process_border(const border_style & borderStyle,
     return res;
 }
 
-std::wstring process_margin(const _CP_OPT(length_or_percent) & margin, double Mul)
+std::wstring docx_process_margin(const _CP_OPT(length_or_percent) & margin, double Mul)
 {
     if (margin)
     {
@@ -288,8 +288,8 @@ void paragraph_format_properties::docx_convert(oox::docx_conversion_context & Co
 			std::wstring w_after, w_before;
 			std::wstring w_line, w_lineRule;
 
-			w_after = process_margin(fo_margin_bottom_, 20.0);
-			w_before = process_margin(fo_margin_top_, 20.0);
+            w_after = docx_process_margin(fo_margin_bottom_, 20.0);
+            w_before = docx_process_margin(fo_margin_top_, 20.0);
 
 			// TODO :   здесь 240 берется из корневого стиля? надо не константу использовать а брать оттуда
 			//          в xsl преобразованиях так же написано 
@@ -341,9 +341,9 @@ void paragraph_format_properties::docx_convert(oox::docx_conversion_context & Co
 			// TODO auto indent
 			std::wstring w_left, w_right, w_hanging, w_firstLine;
 
-			w_left = process_margin(fo_margin_left_, 20.0);
-			w_right = process_margin(fo_margin_right_, 20.0);
-			w_firstLine = process_margin(fo_text_indent_, 20.0);
+            w_left = docx_process_margin(fo_margin_left_, 20.0);
+            w_right = docx_process_margin(fo_margin_right_, 20.0);
+            w_firstLine = docx_process_margin(fo_text_indent_, 20.0);
 
 			if (w_left.empty())			w_left = L"0";
 			if (w_right.empty())		w_right = L"0";

ASCOfficeOdfFile/src/odf/style_paragraph_properties_pptx.cpp

@@ -106,7 +106,7 @@ std::wstring process_border(border_style	& borderStyle,
     return res;
 }
 
-std::wstring process_margin(const _CP_OPT(length_or_percent) & margin, length::unit unit, double Mul)
+std::wstring pptx_process_margin(const _CP_OPT(length_or_percent) & margin, length::unit unit, double Mul)
 {
     if (margin)
     {
@@ -156,9 +156,9 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
 				// TODO auto indent
 				std::wstring w_left, w_right, w_firstLine;
 
-				w_left = process_margin(fo_margin_left_, length::emu, 1.);
-				w_right = process_margin(fo_margin_right_, length::emu, 1.);
-				w_firstLine = process_margin(fo_text_indent_,length::emu, 1.);
+                w_left = pptx_process_margin(fo_margin_left_, length::emu, 1.);
+                w_right = pptx_process_margin(fo_margin_right_, length::emu, 1.);
+                w_firstLine = pptx_process_margin(fo_text_indent_,length::emu, 1.);
 
 				//if (w_left.empty())		w_left = L"0";
 				//if (w_right.empty())		w_right = L"0";
@@ -227,7 +227,7 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
 				{
 					if (fo_margin_bottom_->get_type() == length_or_percent::Length)
 					{
-						std::wstring w_before = process_margin(fo_margin_top_, length::pt, 100.0);
+                        std::wstring w_before = pptx_process_margin(fo_margin_top_, length::pt, 100.0);
 						CP_XML_NODE(L"a:spcPts")
 						{
 							CP_XML_ATTR(L"val",w_before);
@@ -250,7 +250,7 @@ void paragraph_format_properties::xlsx_convert(std::wostream & strm, bool in_dra
 				{
 					if (fo_margin_bottom_->get_type() == length_or_percent::Length)
 					{
-						std::wstring w_after = process_margin(fo_margin_bottom_, length::pt, 100.0);
+                        std::wstring w_after = pptx_process_margin(fo_margin_bottom_, length::pt, 100.0);
 						CP_XML_NODE(L"a:spcPts")
 						{
 							CP_XML_ATTR(L"val",w_after);
@@ -281,9 +281,9 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
 		// TODO auto indent
 		std::wstring w_left, w_right, w_firstLine;
 
-		w_left = process_margin(fo_margin_left_, length::emu, 1.);
-		w_right = process_margin(fo_margin_right_, length::emu, 1.);
-		w_firstLine = process_margin(fo_text_indent_,length::emu, 1.);
+        w_left = pptx_process_margin(fo_margin_left_, length::emu, 1.);
+        w_right = pptx_process_margin(fo_margin_right_, length::emu, 1.);
+        w_firstLine = pptx_process_margin(fo_text_indent_,length::emu, 1.);
 
 		//if (w_left.empty())			w_left = L"0";
 		//if (w_right.empty())		w_right = L"0";
@@ -460,7 +460,7 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
 			{
 				if (fo_margin_bottom_->get_type() == length_or_percent::Length)
 				{
-					std::wstring w_before = process_margin(fo_margin_top_, length::pt, 100.0);
+                    std::wstring w_before = pptx_process_margin(fo_margin_top_, length::pt, 100.0);
 					CP_XML_NODE(L"a:spcPts")
 					{
 						CP_XML_ATTR(L"val",w_before);
@@ -483,7 +483,7 @@ void paragraph_format_properties::pptx_convert(oox::pptx_conversion_context & Co
 			{
 				if (fo_margin_bottom_->get_type() == length_or_percent::Length)
 				{
-					std::wstring w_after = process_margin(fo_margin_bottom_, length::pt, 100.0);
+                    std::wstring w_after = pptx_process_margin(fo_margin_bottom_, length::pt, 100.0);
 					CP_XML_NODE(L"a:spcPts")
 					{
 						CP_XML_ATTR(L"val",w_after);

ASCOfficeOdfFile/src/progressCallback.h

@@ -29,14 +29,16 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
+
 #pragma once
 
-typedef void (*OnProgressCallback)( void* lpParam, long nID, long nPercent );
-typedef void (*OnProgressExCallback)( void* lpParam, long nID, long nPercent, short* Cancel );
+typedef void (*OnProgressCallbackOdf)  ( void* lpParam, long nID, long nPercent );
+typedef void (*OnProgressExCallbackOdf)( void* lpParam, long nID, long nPercent, short* Cancel ) ;
 
 struct ProgressCallback
 {
-  OnProgressCallback    OnProgress;
-  OnProgressExCallback  OnProgressEx;
+  OnProgressCallbackOdf    OnProgress;
+  OnProgressExCallbackOdf  OnProgressEx;
   void* caller;
 };
+

ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro

@@ -35,10 +35,12 @@ CONFIG(debug, debug|release){
 DEFINES +=  _DEBUG
 }
 
-build_fast {
+core_release {
 SOURCES += \
-    odffilewriterlib_all.cpp
-} else {
+    odffilewriterlib_odf.cpp
+}
+
+core_debug {
 SOURCES += \
     ../source/OdfFormat/abstract_xml.cpp \
     ../source/OdfFormat/calcext_elements.cpp \
@@ -93,17 +95,18 @@ SOURCES += \
     ../source/OdfFormat/table_database_ranges.cpp \
     ../source/OdfFormat/table_named_expressions.cpp \
     ../source/OdfFormat/text_elements.cpp \
-    ../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/OdfFormat/odf_settings_context.cpp \
     ../source/OdfFormat/office_settings.cpp \
     ../source/OdfFormat/mediaitems_utils.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
 
 HEADERS += \
     ../source/OdfFormat/abstract_xml.h \

ASCOfficeOdfFileW/linux/odffilewriterlib_all.cpp → ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp

@@ -29,7 +29,6 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-//#include "../source/OdfFormat/abstract_xml.cpp"
 #include "../source/OdfFormat/calcext_elements.cpp"
 #include "../source/OdfFormat/draw_base.cpp"
 #include "../source/OdfFormat/draw_frame.cpp"
@@ -37,11 +36,11 @@
 #include "../source/OdfFormat/header_footer.cpp"
 #include "../source/OdfFormat/list.cpp"
 #include "../source/OdfFormat/mediaitems.cpp"
-#include "../source/OdfFormat/mediaitems_utils.cpp"
 #include "../source/OdfFormat/number_style.cpp"
 #include "../source/OdfFormat/object_package.cpp"
 #include "../source/OdfFormat/odf_chart_context.cpp"
 #include "../source/OdfFormat/odf_comment_context.cpp"
+#include "../source/OdfFormat/odf_notes_context.cpp"
 #include "../source/OdfFormat/odf_conversion_context.cpp"
 #include "../source/OdfFormat/odf_drawing_context.cpp"
 #include "../source/OdfFormat/odf_lists_styles_context.cpp"
@@ -82,9 +81,6 @@
 #include "../source/OdfFormat/table_database_ranges.cpp"
 #include "../source/OdfFormat/table_named_expressions.cpp"
 #include "../source/OdfFormat/text_elements.cpp"
-#include "../source/Oox2OdfConverter/ConvertDiagram.cpp"
-#include "../source/Oox2OdfConverter/Converter.cpp"
-#include "../source/Oox2OdfConverter/ConverterChart.cpp"
-#include "../source/Oox2OdfConverter/ConvertVml.cpp"
-#include "../source/Oox2OdfConverter/DocxConverter.cpp"
-#include "../source/Oox2OdfConverter/XlsxConverter.cpp"
+#include "../source/OdfFormat/odf_settings_context.cpp"
+#include "../source/OdfFormat/office_settings.cpp"
+#include "../source/OdfFormat/mediaitems_utils.cpp"

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h

@@ -89,7 +89,7 @@ namespace NSPresentationEditor
 			// теперь нужно скопировать картинку
 			if (strOutput != strInput)
 			{
-				if (CDirectory::CopyFile(strInput, strOutput, NULL, NULL) == false)
+                if (CDirectory::CopyFile(strInput, strOutput) == false)
 				{
 					return L"";
 				}

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -281,7 +281,7 @@ namespace NSBinPptxRW
 			pathOutput = m_strDstMedia + FILE_SEPARATOR_STR + strImage + strExts;
 			// теперь нужно скопировать картинку
             if (pathOutput.GetPath() != strInput)
-                CDirectory::CopyFile(strInput, pathOutput.GetPath(), NULL, NULL);
+                CDirectory::CopyFile(strInput, pathOutput.GetPath());
 		}
 		else
 		{
@@ -308,7 +308,7 @@ namespace NSBinPptxRW
 			}
 			else
 			{
-				CDirectory::CopyFile(strOleImage, strOleImageOut, NULL, NULL);
+                CDirectory::CopyFile(strOleImage, strOleImageOut);
 			}
 
 			if (!m_bIsWord)

ASCOfficeRtfFile/RtfFormatLib/source/UniversalConverterUtils.h

@@ -46,7 +46,7 @@ public:
 			return 1;
 
 		//копируем
-		CDirectory::CopyFile(sSource, sDestination, NULL, NULL);
+        CDirectory::CopyFile(sSource, sDestination);
 
 		return 0;
 	}

ASCOfficeXlsFile2/source/linux/xlsformatlib_logic.cpp

@@ -733,6 +733,7 @@
 #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertyFactory.cpp"
 #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySet.cpp"
 #include "../XlsFormat/Logic/SummaryInformationStream/Structures/PropertySetStream.cpp"
+#include "../XlsFormat/Logic/SummaryInformationStream/Structures/CodePageOle.cpp"
 #include "../XlsFormat/Logic/SummaryInformationStream/SummaryInformation.cpp"
 
 #include "../XlsFormat/Logic/AnyObject.cpp"