odf minor

This commit is contained in:
Vikulov Dmitry
2022-12-10 10:39:02 +03:00
parent 0da7b35757
commit aeaa86c88f
2 changed files with 199 additions and 197 deletions

View File

@ -150,86 +150,87 @@ SOURCES += \
../../DataTypes/timeperiod.cpp \
../../DataTypes/messagetype.cpp \
../../DataTypes/stylecellprotect.cpp \
../../Reader/Format/abstract_xml.cpp \
../../Reader/Format/anim_elements.cpp \
../../Reader/Format/calcs_styles.cpp \
../../Reader/Format/chart_build_oox.cpp \
../../Reader/Format/createandread.cpp \
../../Reader/Format/documentcontext.cpp \
../../Reader/Format/draw_common.cpp \
../../Reader/Format/draw_frame.cpp \
../../Reader/Format/draw_frame_docx.cpp \
../../Reader/Format/draw_frame_pptx.cpp \
../../Reader/Format/draw_frame_xlsx.cpp \
../../Reader/Format/draw_page.cpp \
../../Reader/Format/draw_shapes.cpp \
../../Reader/Format/draw_shapes_docx.cpp \
../../Reader/Format/draw_shapes_pptx.cpp \
../../Reader/Format/draw_shapes_xlsx.cpp \
../../Reader/Format/font_face.cpp \
../../Reader/Format/header_footer.cpp \
../../Reader/Format/list.cpp \
../../Reader/Format/note.cpp \
../../Reader/Format/number_style.cpp \
../../Reader/Format/odf_content_xml.cpp \
../../Reader/Format/odfcontext.cpp \
../../Reader/Format/odf_document.cpp \
../../Reader/Format/odf_document_impl.cpp \
../../Reader/Format/office_annotation.cpp \
../../Reader/Format/office_binary_data.cpp \
../../Reader/Format/office_body.cpp \
../../Reader/Format/office_chart.cpp \
../../Reader/Format/office_document.cpp \
../../Reader/Format/office_elements_create.cpp \
../../Reader/Format/office_event_listeners.cpp \
../../Reader/Format/office_presentation.cpp \
../../Reader/Format/office_scripts.cpp \
../../Reader/Format/office_forms.cpp \
../../Reader/Format/office_settings.cpp \
../../Reader/Format/office_spreadsheet.cpp \
../../Reader/Format/office_text.cpp \
../../Reader/Format/office_meta.cpp \
../../Reader/Format/paragraph_elements.cpp \
../../Reader/Format/ruby.cpp \
../../Reader/Format/search_table_cell.cpp \
../../Reader/Format/skipelement.cpp \
../../Reader/Format/style_chart_properties.cpp \
../../Reader/Format/style_graphic_properties.cpp \
../../Reader/Format/style_map.cpp \
../../Reader/Format/style_properties.cpp \
../../Reader/Format/style_paragraph_properties.cpp \
../../Reader/Format/style_paragraph_properties_docx.cpp \
../../Reader/Format/style_paragraph_properties_pptx.cpp \
../../Reader/Format/style_presentation.cpp \
../../Reader/Format/style_regions.cpp \
../../Reader/Format/styles.cpp \
../../Reader/Format/styles_list.cpp \
../../Reader/Format/styles_lite_container.cpp \
../../Reader/Format/style_table_properties.cpp \
../../Reader/Format/style_text_properties.cpp \
../../Reader/Format/svg_parser.cpp \
../../Reader/Format/table.cpp \
../../Reader/Format/table_calculation_settings.cpp \
../../Reader/Format/table_docx.cpp \
../../Reader/Format/table_named_expressions.cpp \
../../Reader/Format/table_data_pilot_tables.cpp \
../../Reader/Format/table_pptx.cpp \
../../Reader/Format/table_xlsx.cpp \
../../Reader/Format/templates.cpp \
../../Reader/Format/text_content.cpp \
../../Reader/Format/text_elements.cpp \
../../Reader/Format/math_elementaries.cpp \
../../Reader/Format/math_layout_elements.cpp \
../../Reader/Format/math_limit_elements.cpp \
../../Reader/Format/math_table_elements.cpp \
../../Reader/Format/math_token_elements.cpp \
../../Reader/Format/calcext_elements.cpp \
../../Reader/Format/table_database_ranges.cpp \
../../Reader/Format/math_elements.cpp \
\
../../Reader/Format/abstract_xml.cpp \
../../Reader/Format/anim_elements.cpp \
../../Reader/Format/calcs_styles.cpp \
../../Reader/Format/chart_build_oox.cpp \
../../Reader/Format/createandread.cpp \
../../Reader/Format/documentcontext.cpp \
../../Reader/Format/draw_common.cpp \
../../Reader/Format/draw_frame.cpp \
../../Reader/Format/draw_frame_docx.cpp \
../../Reader/Format/draw_frame_pptx.cpp \
../../Reader/Format/draw_frame_xlsx.cpp \
../../Reader/Format/draw_page.cpp \
../../Reader/Format/draw_shapes.cpp \
../../Reader/Format/draw_shapes_docx.cpp \
../../Reader/Format/draw_shapes_pptx.cpp \
../../Reader/Format/draw_shapes_xlsx.cpp \
../../Reader/Format/font_face.cpp \
../../Reader/Format/header_footer.cpp \
../../Reader/Format/list.cpp \
../../Reader/Format/note.cpp \
../../Reader/Format/number_style.cpp \
../../Reader/Format/odf_content_xml.cpp \
../../Reader/Format/odfcontext.cpp \
../../Reader/Format/odf_document.cpp \
../../Reader/Format/odf_document_impl.cpp \
../../Reader/Format/office_annotation.cpp \
../../Reader/Format/office_binary_data.cpp \
../../Reader/Format/office_body.cpp \
../../Reader/Format/office_chart.cpp \
../../Reader/Format/office_document.cpp \
../../Reader/Format/office_elements_create.cpp \
../../Reader/Format/office_event_listeners.cpp \
../../Reader/Format/office_presentation.cpp \
../../Reader/Format/office_scripts.cpp \
../../Reader/Format/office_forms.cpp \
../../Reader/Format/office_settings.cpp \
../../Reader/Format/office_spreadsheet.cpp \
../../Reader/Format/office_text.cpp \
../../Reader/Format/office_meta.cpp \
../../Reader/Format/paragraph_elements.cpp \
../../Reader/Format/ruby.cpp \
../../Reader/Format/search_table_cell.cpp \
../../Reader/Format/skipelement.cpp \
../../Reader/Format/style_chart_properties.cpp \
../../Reader/Format/style_graphic_properties.cpp \
../../Reader/Format/style_map.cpp \
../../Reader/Format/style_properties.cpp \
../../Reader/Format/style_paragraph_properties.cpp \
../../Reader/Format/style_paragraph_properties_docx.cpp \
../../Reader/Format/style_paragraph_properties_pptx.cpp \
../../Reader/Format/style_presentation.cpp \
../../Reader/Format/style_regions.cpp \
../../Reader/Format/styles.cpp \
../../Reader/Format/styles_list.cpp \
../../Reader/Format/styles_lite_container.cpp \
../../Reader/Format/style_table_properties.cpp \
../../Reader/Format/style_text_properties.cpp \
../../Reader/Format/svg_parser.cpp \
../../Reader/Format/table.cpp \
../../Reader/Format/table_calculation_settings.cpp \
../../Reader/Format/table_docx.cpp \
../../Reader/Format/table_named_expressions.cpp \
../../Reader/Format/table_data_pilot_tables.cpp \
../../Reader/Format/table_pptx.cpp \
../../Reader/Format/table_xlsx.cpp \
../../Reader/Format/templates.cpp \
../../Reader/Format/text_content.cpp \
../../Reader/Format/text_elements.cpp \
../../Reader/Format/math_elementaries.cpp \
../../Reader/Format/math_layout_elements.cpp \
../../Reader/Format/math_limit_elements.cpp \
../../Reader/Format/math_table_elements.cpp \
../../Reader/Format/math_token_elements.cpp \
../../Reader/Format/calcext_elements.cpp \
../../Reader/Format/table_database_ranges.cpp \
../../Reader/Format/math_elements.cpp \
../../Reader/Converter/xlsx_conditionalFormatting.cpp \
../../Reader/Converter/ConvertOO2OOX.cpp \
../../Reader/Converter/conversionelement.cpp \
../../Reader/Converter/xlsx_dxfs.cpp \
../../Reader/Converter/ConvertOO2OOX.cpp \
../../Reader/Converter/conversionelement.cpp \
../../Reader/Converter/xlsx_dxfs.cpp \
../../Reader/Converter/docx_content_type.cpp \
../../Reader/Converter/docx_conversion_context.cpp \
../../Reader/Converter/docx_drawing.cpp \
@ -302,7 +303,7 @@ SOURCES += \
../../Reader/Converter/xlsx_utils.cpp \
../../Reader/Converter/xlsx_xf.cpp \
\
../../Writer/Format/office_document.cpp \
../../Writer/Format/office_document.cpp \
../../Writer/Format/office_forms.cpp \
../../Writer/Format/abstract_xml.cpp \
../../Writer/Format/calcext_elements.cpp \
@ -388,12 +389,12 @@ SOURCES += \
../../Common/xml/sax_xmllite.cpp \
../../Common/xml/utils.cpp \
../../Common/xml/xmlchar.cpp \
../../Common/CPColorUtils.cpp \
../../Common/CPString.cpp \
../../Common/readdocelement.cpp \
../../Common/utils.cpp \
../../Common/logging.cpp \
\
../../Common/CPColorUtils.cpp \
../../Common/CPString.cpp \
../../Common/readdocelement.cpp \
../../Common/utils.cpp \
../../Common/logging.cpp \
\
../../Writer/Converter/Converter.cpp \
../../Writer/Converter/ConverterChart.cpp \
../../Writer/Converter/ConvertVml.cpp \
@ -403,76 +404,32 @@ SOURCES += \
../../Writer/Converter/ConvertDrawing.cpp \
../../Writer/Converter/PptxConverter.cpp
HEADERS += \
../../Reader/Format/odf_document.h \
../../Reader/Format/abstract_xml.h \
../../Reader/Format/all_elements.h \
../../Reader/Format/anim_elements.h \
../../Reader/Format/calcs_styles.h \
../../Reader/Format/chart_build_oox.h \
../../Reader/Format/chart_objects.h \
../../Reader/Format/documentcontext.h \
../../Reader/Format/draw_common.h \
../../Reader/Format/draw_frame.h \
../../Reader/Format/draw_page.h \
../../Reader/Format/draw_shapes.h \
../../Reader/Format/font_face.h \
../../Reader/Format/header_footer.h \
../../Reader/Format/list.h \
../../Reader/Format/note.h \
../../Reader/Format/number_style.h \
../../Reader/Format/odf_content_xml.h \
../../Reader/Format/odfcontext.h \
../../Reader/Format/odf_document_impl.h \
../../Reader/Format/office_annotation.h \
../../Reader/Format/office_binary_data.h \
../../Reader/Format/office_body.h \
../../Reader/Format/office_chart.h \
../../Reader/Format/office_document.h \
../../Reader/Format/office_elements.h \
../../Reader/Format/office_elements_create.h \
../../Reader/Format/office_elements_type.h \
../../Reader/Format/office_event_listeners.h \
../../Reader/Format/office_presentation.h \
../../Reader/Format/office_scripts.h \
../../Reader/Format/office_forms.h \
../../Reader/Format/office_settings.h \
../../Reader/Format/office_spreadsheet.h \
../../Reader/Format/office_text.h \
../../Reader/Format/office_meta.h \
../../Reader/Format/paragraph_elements.h \
../../Reader/Format/ruby.h \
../../Reader/Format/search_table_cell.h \
../../Reader/Format/serialize_elements.h \
../../Reader/Format/skipelement.h \
../../Reader/Format/style_chart_properties.h \
../../Reader/Format/style_graphic_properties.h \
../../Reader/Format/style_map.h \
../../Reader/Format/style_paragraph_properties.h \
../../Reader/Format/style_presentation.h \
../../Reader/Format/style_regions.h \
../../Reader/Format/styles.h \
../../Reader/Format/styles_list.h \
../../Reader/Format/styles_lite_container.h \
../../Reader/Format/style_table_properties.h \
../../Reader/Format/style_text_properties.h \
../../Reader/Format/svg_parser.h \
../../Reader/Format/table.h \
../../Reader/Format/table_calculation_settings.h \
../../Reader/Format/table_named_expressions.h \
../../Reader/Format/templates.h \
../../Reader/Format/text_content.h \
../../Reader/Format/text_elements.h \
../../Reader/Format/visitor.h \
../../Reader/Format/math_elements.h \
../../Reader/Format/math_elementaries.h \
../../Reader/Format/math_layout_elements.h \
../../Reader/Format/math_limit_elements.h \
../../Reader/Format/math_table_elements.h \
../../Reader/Format/math_token_elements.h \
../../Reader/Format/calcext_elements.h \
../../Reader/Format/table_database_ranges.h \
../../Common/xml/sax_xmllite.h \
../../Common/errors.h \
../../Common/logging.h \
../../Common/CPColorUtils.h \
../../Common/CPNoncopyable.h \
../../Common/CPOptional.h \
../../Common/CPScopedPtr.h \
../../Common/CPSharedPtr.h \
../../Common/CPString.h \
../../Common/CPWeakPtr.h \
../../Common/readdocelement.h \
../../Common/readstring.h \
../../Common/writedocelement.h \
../../Common/utf8cpp/utf8/checked.h \
../../Common/utf8cpp/utf8/core.h \
../../Common/utf8cpp/utf8/unchecked.h \
../../Common/utf8cpp/utf8.h \
../../Common/xml/attributes.h \
../../Common/xml/nodetype.h \
../../Common/xml/sax.h \
../../Common/xml/simple_xml_writer.h \
../../Common/xml/utils.h \
../../Common/xml/xmlchar.h \
../../Common/xml/xmlelement.h \
\
../../DataTypes/mathvariant.h \
../../DataTypes/anchortype.h \
../../DataTypes/backgroundcolor.h \
@ -575,6 +532,76 @@ HEADERS += \
../../DataTypes/timeperiod.h \
../../DataTypes/messagetype.h \
../../DataTypes/stylecellprotect.h \
\
../../Formulas/formulasconvert.h \
../../Reader/Format/odf_document.h \
../../Reader/Format/abstract_xml.h \
../../Reader/Format/all_elements.h \
../../Reader/Format/anim_elements.h \
../../Reader/Format/calcs_styles.h \
../../Reader/Format/chart_build_oox.h \
../../Reader/Format/chart_objects.h \
../../Reader/Format/documentcontext.h \
../../Reader/Format/draw_common.h \
../../Reader/Format/draw_frame.h \
../../Reader/Format/draw_page.h \
../../Reader/Format/draw_shapes.h \
../../Reader/Format/font_face.h \
../../Reader/Format/header_footer.h \
../../Reader/Format/list.h \
../../Reader/Format/note.h \
../../Reader/Format/number_style.h \
../../Reader/Format/odf_content_xml.h \
../../Reader/Format/odfcontext.h \
../../Reader/Format/odf_document_impl.h \
../../Reader/Format/office_annotation.h \
../../Reader/Format/office_binary_data.h \
../../Reader/Format/office_body.h \
../../Reader/Format/office_chart.h \
../../Reader/Format/office_document.h \
../../Reader/Format/office_elements.h \
../../Reader/Format/office_elements_create.h \
../../Reader/Format/office_elements_type.h \
../../Reader/Format/office_event_listeners.h \
../../Reader/Format/office_presentation.h \
../../Reader/Format/office_scripts.h \
../../Reader/Format/office_forms.h \
../../Reader/Format/office_settings.h \
../../Reader/Format/office_spreadsheet.h \
../../Reader/Format/office_text.h \
../../Reader/Format/office_meta.h \
../../Reader/Format/paragraph_elements.h \
../../Reader/Format/ruby.h \
../../Reader/Format/search_table_cell.h \
../../Reader/Format/serialize_elements.h \
../../Reader/Format/skipelement.h \
../../Reader/Format/style_chart_properties.h \
../../Reader/Format/style_graphic_properties.h \
../../Reader/Format/style_map.h \
../../Reader/Format/style_paragraph_properties.h \
../../Reader/Format/style_presentation.h \
../../Reader/Format/style_regions.h \
../../Reader/Format/styles.h \
../../Reader/Format/styles_list.h \
../../Reader/Format/styles_lite_container.h \
../../Reader/Format/style_table_properties.h \
../../Reader/Format/style_text_properties.h \
../../Reader/Format/svg_parser.h \
../../Reader/Format/table.h \
../../Reader/Format/table_calculation_settings.h \
../../Reader/Format/table_named_expressions.h \
../../Reader/Format/templates.h \
../../Reader/Format/text_content.h \
../../Reader/Format/text_elements.h \
../../Reader/Format/visitor.h \
../../Reader/Format/math_elements.h \
../../Reader/Format/math_elementaries.h \
../../Reader/Format/math_layout_elements.h \
../../Reader/Format/math_limit_elements.h \
../../Reader/Format/math_table_elements.h \
../../Reader/Format/math_token_elements.h \
../../Reader/Format/calcext_elements.h \
../../Reader/Format/table_database_ranges.h \
../../Reader/Converter/docx_content_type.h \
../../Reader/Converter/docx_conversion_context.h \
../../Reader/Converter/docx_conversion_state.h \
@ -655,33 +682,8 @@ HEADERS += \
../../Reader/Converter/xlsx_data_validation.h \
../../Reader/Converter/xlsx_utils.h \
../../Reader/Converter/xlsx_xf.h \
../../Formulas/formulasconvert.h \
../../Reader/Converter/conversionelement.h \
../../Reader/Converter/ConvertOO2OOX.h \
../../Common/xml/sax_xmllite.h \
../../Common/errors.h \
../../Common/logging.h \
../../Common/CPColorUtils.h \
../../Common/CPNoncopyable.h \
../../Common/CPOptional.h \
../../Common/CPScopedPtr.h \
../../Common/CPSharedPtr.h \
../../Common/CPString.h \
../../Common/CPWeakPtr.h \
../../Common/readdocelement.h \
../../Common/readstring.h \
../../Common/writedocelement.h \
../../Common/utf8cpp/utf8/checked.h \
../../Common/utf8cpp/utf8/core.h \
../../Common/utf8cpp/utf8/unchecked.h \
../../Common/utf8cpp/utf8.h \
../../Common/xml/attributes.h \
../../Common/xml/nodetype.h \
../../Common/xml/sax.h \
../../Common/xml/simple_xml_writer.h \
../../Common/xml/utils.h \
../../Common/xml/xmlchar.h \
../../Common/xml/xmlelement.h \
../../Reader/Converter/conversionelement.h \
../../Reader/Converter/ConvertOO2OOX.h \
\
../../Writer/Format/math_elementaries.h \
../../Writer/Format/math_elements.h \

View File

@ -70,22 +70,22 @@
//#include "../../DataTypes/verticalalign.h"
//#include "../../DataTypes/wrapoption.h"
//#include "../../Formulas/formulasconvert.h"
#include "../../Formulas/formulasconvert.h"
//#include "../../Common/errors.h"
//#include "../../Common/logging.h"
//#include "../../Common/CPNoncopyable.h"
//#include "../../Common/CPOptional.h"
//#include "../../Common/CPScopedPtr.h"
//#include "../../Common/CPSharedPtr.h"
//#include "../../Common/CPWeakPtr.h"
#include "../../Common/errors.h"
#include "../../Common/logging.h"
#include "../../Common/CPNoncopyable.h"
#include "../../Common/CPOptional.h"
#include "../../Common/CPScopedPtr.h"
#include "../../Common/CPSharedPtr.h"
#include "../../Common/CPWeakPtr.h"
//#include "../../Common/xml/nodetype.h"
//#include "../../Common/xml/sax.h"
//#include "../../Common/xml/utils.h"
//#include "../../Common/xml/xmlelement.h"
//#include "../../Common/xml/simple_xml_writer.h"
//#include "../../Common/xml/xmlchar.h"
//#include "../../Common/xml/attributes.h"
#include "../../Common/xml/nodetype.h"
#include "../../Common/xml/sax.h"
#include "../../Common/xml/utils.h"
#include "../../Common/xml/xmlelement.h"
#include "../../Common/xml/simple_xml_writer.h"
#include "../../Common/xml/xmlchar.h"
#include "../../Common/xml/attributes.h"
#endif