This commit is contained in:
Elena.Subbotina
2022-11-21 15:32:23 +03:00
parent 45e89465d1
commit 4b0ca24396
62 changed files with 945 additions and 1206 deletions

View File

@ -38,8 +38,8 @@
#include "office_elements.h"
#include "office_elements_create.h"
#include "common_attlists.h"
#include "smil_transitiontype.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/smil_transitiontype.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -44,11 +44,11 @@
#include <xml/attributes.h>
#include "style_graphic_properties.h"
#include "length.h"
#include "borderstyle.h"
#include "odf_conversion_context.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/borderstyle.h"
namespace cpdoccore {
using namespace odf_types;

View File

@ -39,7 +39,7 @@
#include "office_elements.h"
#include "office_elements_create.h"
#include "presentationclass.h"
#include "../../DataTypes/presentationclass.h"
namespace cpdoccore {

View File

@ -47,9 +47,9 @@
#include "style_graphic_properties.h"
#include "length.h"
#include "borderstyle.h"
#include "custom_shape_types_convert.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/borderstyle.h"
#include "../../DataTypes/custom_shape_types_convert.h"
#include "odf_conversion_context.h"

View File

@ -33,8 +33,8 @@
#include "draw_base.h"
#include "common_attlists.h"
#include "targetframename.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/targetframename.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {

View File

@ -38,8 +38,9 @@
#include <xml/simple_xml_writer.h>
#include "office_elements_create.h"
#include "mathvariant.h"
#include "../DataTypes/common_attlists.h"
#include "../../DataTypes/mathvariant.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include <CPOptional.h>
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer

View File

@ -39,9 +39,9 @@
#include "office_elements_create.h"
#include "stylewrap.h"
#include "gradientstyle.h"
#include "common_attlists.h"
#include "../../DataTypes/stylewrap.h"
#include "../../DataTypes/gradientstyle.h"
#include "../../DataTypes/common_attlists.h"
namespace OOX {namespace Vml { class CShapeType; }}

View File

@ -37,7 +37,7 @@
#include "office_elements_create.h"
#include "officevaluetype.h"
#include "../../DataTypes/officevaluetype.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -35,8 +35,8 @@
#include "odf_page_layout_state.h"
#include "length.h"
#include "color.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/color.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -36,8 +36,8 @@
#include "office_elements_create.h"
#include "length.h"
#include "stylenumformat.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/stylenumformat.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -36,7 +36,7 @@
#include "office_elements_create.h"
#include "stylefamily.h"
#include "../../DataTypes/stylefamily.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "fobreak.h"
#include "../../DataTypes/fobreak.h"
namespace cpdoccore {
namespace odf_writer

View File

@ -45,7 +45,7 @@
#include "office_elements_create.h"
#include "style_graphic_properties.h"
#include "officevaluetype.h"
#include "../../DataTypes/officevaluetype.h"
namespace cpdoccore {

View File

@ -39,8 +39,8 @@
#include "office_elements_create.h"
#include "bool.h"
#include "length.h"
#include "../../DataTypes/bool.h"
#include "../../DataTypes/length.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -36,12 +36,12 @@
#include <xml/xmlelement.h>
#include <xml/nodetype.h>
#include "common_attlists.h"
#include "charttimeunit.h"
#include "chartclass.h"
#include "text_elements.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/charttimeunit.h"
#include "../../DataTypes/chartclass.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -39,8 +39,8 @@
#include "office_elements_create.h"
#include "bool.h"
#include "length.h"
#include "../../DataTypes/bool.h"
#include "../../DataTypes/length.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements.h"
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -39,9 +39,9 @@
#include "office_elements.h"
#include "office_elements_create.h"
#include "common_attlists.h"
#include "commandtype.h"
#include "tablecentering.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/commandtype.h"
#include "../../DataTypes/tablecentering.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include <xml/nodetype.h>
#include "office_elements_create.h"
#include "bool.h"
#include "../../DataTypes/bool.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -40,7 +40,7 @@
#include <xml/simple_xml_writer.h>
#include "bool.h"
#include "../../DataTypes/bool.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -46,17 +46,16 @@
#include <CPOptional.h>
#include <CPWeakPtr.h>
#include "targetframename.h"
#include "styles.h"
//#include "note.h"
//#include "ruby.h"
#include "office_elements_create.h"
#include "odf_conversion_context.h"
#include "style_text_properties.h"
#include "../../DataTypes/targetframename.h"
namespace cpdoccore {
using namespace odf_types;

View File

@ -39,11 +39,11 @@
#include "office_elements_create.h"
#include "targetframename.h"
#include "noteclass.h"
#include "bibliography.h"
#include "../../DataTypes/targetframename.h"
#include "../../DataTypes/noteclass.h"
#include "../../DataTypes/bibliography.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,17 +38,17 @@
#include "office_elements_create.h"
#include "chartsymbol.h"
#include "length.h"
#include "chartinterpolation.h"
#include "chartsolidtype.h"
#include "chartlabelarrangement.h"
#include "common_attlists.h"
#include "chartdatalabelnumber.h"
#include "charterrorcategory.h"
#include "chartseriessource.h"
#include "chartregressiontype.h"
#include "direction.h"
#include "../../DataTypes/chartsymbol.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/chartinterpolation.h"
#include "../../DataTypes/chartsolidtype.h"
#include "../../DataTypes/chartlabelarrangement.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/chartdatalabelnumber.h"
#include "../../DataTypes/charterrorcategory.h"
#include "../../DataTypes/chartseriessource.h"
#include "../../DataTypes/chartregressiontype.h"
#include "../../DataTypes/direction.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -39,22 +39,22 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "lengthorpercent.h"
#include "stylehorizontalpos.h"
#include "stylehorizontalrel.h"
#include "styleverticalrel.h"
#include "styleverticalpos.h"
#include "anchortype.h"
#include "stylewrap.h"
#include "wrapoption.h"
#include "hyphenationladdercount.h"
#include "stylewrapcontourmode.h"
#include "runthrough.h"
#include "linestyle.h"
#include "markerstyle.h"
#include "verticalalign.h"
#include "gradientstyle.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/lengthorpercent.h"
#include "../../DataTypes/stylehorizontalpos.h"
#include "../../DataTypes/stylehorizontalrel.h"
#include "../../DataTypes/styleverticalrel.h"
#include "../../DataTypes/styleverticalpos.h"
#include "../../DataTypes/anchortype.h"
#include "../../DataTypes/stylewrap.h"
#include "../../DataTypes/wrapoption.h"
#include "../../DataTypes/hyphenationladdercount.h"
#include "../../DataTypes/stylewrapcontourmode.h"
#include "../../DataTypes/runthrough.h"
#include "../../DataTypes/linestyle.h"
#include "../../DataTypes/markerstyle.h"
#include "../../DataTypes/verticalalign.h"
#include "../../DataTypes/gradientstyle.h"
namespace cpdoccore {

View File

@ -44,12 +44,12 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
#include "tablecentering.h"
#include "layoutgridmode.h"
#include "direction.h"
#include "styleprint.h"
#include "../../DataTypes/tablecentering.h"
#include "../../DataTypes/layoutgridmode.h"
#include "../../DataTypes/direction.h"
#include "../../DataTypes/styleprint.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include <xml/attributes.h>
#include <xml/utils.h>
#include "borderstyle.h"
#include "../../DataTypes/borderstyle.h"
namespace cpdoccore {

View File

@ -37,33 +37,33 @@
#include "office_elements_create.h"
#include "linewidth.h"
#include "length.h"
#include "textalign.h"
#include "keeptogether.h"
#include "hyphenationkeep.h"
#include "backgroundcolor.h"
#include "shadowtype.h"
#include "percent.h"
#include "writingmode.h"
#include "verticalalign.h"
#include "linebreak.h"
#include "punctuationwrap.h"
#include "textautospace.h"
#include "hyphenationladdercount.h"
#include "lengthorpercent.h"
#include "styletype.h"
#include "linestyle.h"
#include "linetype.h"
#include "styleleadercolor.h"
#include "dropcaplength.h"
#include "fobreak.h"
#include "styleposition.h"
#include "borderwidths.h"
#include "../../DataTypes/linewidth.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/textalign.h"
#include "../../DataTypes/keeptogether.h"
#include "../../DataTypes/hyphenationkeep.h"
#include "../../DataTypes/backgroundcolor.h"
#include "../../DataTypes/shadowtype.h"
#include "../../DataTypes/percent.h"
#include "../../DataTypes/writingmode.h"
#include "../../DataTypes/verticalalign.h"
#include "../../DataTypes/linebreak.h"
#include "../../DataTypes/punctuationwrap.h"
#include "../../DataTypes/textautospace.h"
#include "../../DataTypes/hyphenationladdercount.h"
#include "../../DataTypes/lengthorpercent.h"
#include "../../DataTypes/styletype.h"
#include "../../DataTypes/linestyle.h"
#include "../../DataTypes/linetype.h"
#include "../../DataTypes/styleleadercolor.h"
#include "../../DataTypes/dropcaplength.h"
#include "../../DataTypes/fobreak.h"
#include "../../DataTypes/styleposition.h"
#include "../../DataTypes/borderwidths.h"
//#include "common_draw_data.h"
//#include "office_binary_data.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore{

View File

@ -31,8 +31,6 @@
*/
#pragma once
#include "common_attlists.h"
#include <xml/xmlelement.h>
#include <xml/nodetype.h>
@ -41,9 +39,9 @@
#include "office_elements_create.h"
#include "anim_elements.h"
#include "presentationclass.h"
#include "drawfill.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/presentationclass.h"
#include "../../DataTypes/drawfill.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -39,8 +39,8 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "verticalalign.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/verticalalign.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -32,7 +32,7 @@
#include <iostream>
#include "style_table_properties.h"
#include "borderstyle.h"
#include "../../DataTypes/borderstyle.h"
#include <xml/simple_xml_writer.h>

View File

@ -39,21 +39,21 @@
#include "office_elements_create.h"
#include "length.h"
#include "percent.h"
#include "lengthorpercent.h"
#include "fobreak.h"
#include "tablealign.h"
#include "common_attlists.h"
#include "bordermodel.h"
#include "verticalalign.h"
#include "borderwidths.h"
#include "textalignsource.h"
#include "direction.h"
#include "wrapoption.h"
#include "rotationalign.h"
#include "bool.h"
#include "stylecellprotect.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/percent.h"
#include "../../DataTypes/lengthorpercent.h"
#include "../../DataTypes/fobreak.h"
#include "../../DataTypes/tablealign.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/bordermodel.h"
#include "../../DataTypes/verticalalign.h"
#include "../../DataTypes/borderwidths.h"
#include "../../DataTypes/textalignsource.h"
#include "../../DataTypes/direction.h"
#include "../../DataTypes/wrapoption.h"
#include "../../DataTypes/rotationalign.h"
#include "../../DataTypes/bool.h"
#include "../../DataTypes/stylecellprotect.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -32,15 +32,16 @@
#include <iostream>
#include <xml/simple_xml_writer.h>
#include <logging.h>
#include "style_text_properties.h"
#include "fontvariant.h"
#include "logging.h"
#include "../../DataTypes/fontvariant.h"
#include "../../DataTypes/common_attlists.h"
#include "common_attlists.h"
#include <xml/simple_xml_writer.h>
//#include "../docx/oox_drawing_fills.h"

View File

@ -39,31 +39,31 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
#include "fontvariant.h"
#include "texttransform.h"
#include "color.h"
#include "linetype.h"
#include "linestyle.h"
#include "linewidth.h"
#include "textposition.h"
#include "fontfamilygeneric.h"
#include "fontpitch.h"
#include "fontsize.h"
#include "scripttype.h"
#include "letterspacing.h"
#include "fontstyle.h"
#include "shadowtype.h"
#include "fontweight.h"
#include "linemode.h"
#include "backgroundcolor.h"
#include "underlinecolor.h"
#include "fontrelief.h"
#include "textcombine.h"
#include "textemphasize.h"
#include "textrotationscale.h"
#include "textdisplay.h"
#include "../../DataTypes/fontvariant.h"
#include "../../DataTypes/texttransform.h"
#include "../../DataTypes/color.h"
#include "../../DataTypes/linetype.h"
#include "../../DataTypes/linestyle.h"
#include "../../DataTypes/linewidth.h"
#include "../../DataTypes/textposition.h"
#include "../../DataTypes/fontfamilygeneric.h"
#include "../../DataTypes/fontpitch.h"
#include "../../DataTypes/fontsize.h"
#include "../../DataTypes/scripttype.h"
#include "../../DataTypes/letterspacing.h"
#include "../../DataTypes/fontstyle.h"
#include "../../DataTypes/shadowtype.h"
#include "../../DataTypes/fontweight.h"
#include "../../DataTypes/linemode.h"
#include "../../DataTypes/backgroundcolor.h"
#include "../../DataTypes/underlinecolor.h"
#include "../../DataTypes/fontrelief.h"
#include "../../DataTypes/textcombine.h"
#include "../../DataTypes/textemphasize.h"
#include "../../DataTypes/textrotationscale.h"
#include "../../DataTypes/textdisplay.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -44,31 +44,30 @@
#include "office_elements_create.h"
#include "stylefamily.h"
#include "textalign.h"
#include "length.h"
#include "styleverticalrel.h"
#include "styleverticalpos.h"
#include "percent.h"
#include "verticalalign.h"
#include "pageusage.h"
#include "tablecentering.h"
#include "layoutgridmode.h"
#include "direction.h"
#include "linestyle.h"
#include "styletype.h"
#include "noteclass.h"
#include "gradientstyle.h"
#include "hatchstyle.h"
#include "fontstyle.h"
#include "fontvariant.h"
#include "fontweight.h"
#include "fontstretch.h"
#include "fontfamilygeneric.h"
#include "fontpitch.h"
#include "drawangle.h"
#include "common_attlists.h"
#include "../../DataTypes/stylefamily.h"
#include "../../DataTypes/textalign.h"
#include "../../DataTypes/length.h"
#include "../../DataTypes/styleverticalrel.h"
#include "../../DataTypes/styleverticalpos.h"
#include "../../DataTypes/percent.h"
#include "../../DataTypes/verticalalign.h"
#include "../../DataTypes/pageusage.h"
#include "../../DataTypes/tablecentering.h"
#include "../../DataTypes/layoutgridmode.h"
#include "../../DataTypes/direction.h"
#include "../../DataTypes/linestyle.h"
#include "../../DataTypes/styletype.h"
#include "../../DataTypes/noteclass.h"
#include "../../DataTypes/gradientstyle.h"
#include "../../DataTypes/hatchstyle.h"
#include "../../DataTypes/fontstyle.h"
#include "../../DataTypes/fontvariant.h"
#include "../../DataTypes/fontweight.h"
#include "../../DataTypes/fontstretch.h"
#include "../../DataTypes/fontfamilygeneric.h"
#include "../../DataTypes/fontpitch.h"
#include "../../DataTypes/drawangle.h"
#include "../../DataTypes/common_attlists.h"
#include "header_footer.h"

View File

@ -41,7 +41,7 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {

View File

@ -38,7 +38,7 @@
#include <xml/attributes.h>
#include <xml/simple_xml_writer.h>
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
namespace cpdoccore {

View File

@ -38,14 +38,14 @@
#include "office_elements_create.h"
#include "tablevisibility.h"
#include "messagetype.h"
#include "common_attlists.h"
#include "tablemode.h"
#include "table_named_expressions.h"
#include "table_database_ranges.h"
#include "../../DataTypes/tablevisibility.h"
#include "../../DataTypes/messagetype.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/tablemode.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,15 +38,15 @@
#include "office_elements_create.h"
#include "common_attlists.h"
#include "bool.h"
#include "grandtotal.h"
#include "membertype.h"
#include "tableorientation.h"
#include "tabletype.h"
#include "tablefunction.h"
#include "tableorder.h"
#include "dategroup.h"
#include "../../DataTypes/common_attlists.h"
#include "../../DataTypes/bool.h"
#include "../../DataTypes/grandtotal.h"
#include "../../DataTypes/membertype.h"
#include "../../DataTypes/tableorientation.h"
#include "../../DataTypes/tabletype.h"
#include "../../DataTypes/tablefunction.h"
#include "../../DataTypes/tableorder.h"
#include "../../DataTypes/dategroup.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,7 +38,7 @@
#include "office_elements_create.h"
#include "bool.h"
#include "../../DataTypes/bool.h"
namespace cpdoccore {
namespace odf_writer {

View File

@ -38,10 +38,10 @@
#include <xml/nodetype.h>
#include "office_elements_create.h"
#include "common_attlists.h"
#include "../../DataTypes/common_attlists.h"
#include "bool.h"
#include "textdisplay.h"
#include "../../DataTypes/bool.h"
#include "../../DataTypes/textdisplay.h"
namespace cpdoccore {
namespace odf_writer {