Commit d87ea16d authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

OdfFileWriter в x2t

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62942 954022d7-b5bf-4e40-9824-e11837661b57
parent 90931b7a
#-------------------------------------------------
#
# Project created by QtCreator 2015-06-07T13:03:16
#
#-------------------------------------------------
QT -= core gui
TARGET = OdfFileWriterLib
TEMPLATE = lib
CONFIG += staticlib
QMAKE_CXXFLAGS += -std=c++11 -Wall -Wno-ignored-qualifiers
DEFINES += UNICODE \
_UNICODE \
_LINUX_QT \
LINUX \
_USE_LIBXML2_READER_ \
_USE_XMLLITE_READER_ \
USE_LITE_READER
INCLUDEPATH += /usr/include/libxml2
INCLUDEPATH += ../../DesktopEditor/freetype-2.5.2/include
INCLUDEPATH += ../../ASCOfficeOdfFile/include
INCLUDEPATH += ../../ASCOfficeOdfFile/src/odf/datatypes
CONFIG(debug, debug|release){
DEFINES += _DEBUG
}
SOURCES += \
../source/OdfFormat/abstract_xml.cpp \
../source/OdfFormat/calcext_elements.cpp \
../source/OdfFormat/draw_base.cpp \
../source/OdfFormat/draw_frame.cpp \
../source/OdfFormat/draw_shapes.cpp \
../source/OdfFormat/header_footer.cpp \
../source/OdfFormat/list.cpp \
../source/OdfFormat/mediaitems.cpp \
../source/OdfFormat/mediaitems_utils.cpp \
../source/OdfFormat/number_style.cpp \
../source/OdfFormat/object_package.cpp \
../source/OdfFormat/odf_chart_context.cpp \
../source/OdfFormat/odf_comment_context.cpp \
../source/OdfFormat/odf_conversion_context.cpp \
../source/OdfFormat/odf_drawing_context.cpp \
../source/OdfFormat/odf_lists_styles_context.cpp \
../source/OdfFormat/odf_number_styles_context.cpp \
../source/OdfFormat/odf_page_layout_context.cpp \
../source/OdfFormat/odf_page_layout_state.cpp \
../source/OdfFormat/odf_rels.cpp \
../source/OdfFormat/odf_style_context.cpp \
../source/OdfFormat/odf_style_state.cpp \
../source/OdfFormat/odf_table_context.cpp \
../source/OdfFormat/odf_table_styles_context.cpp \
../source/OdfFormat/odf_text_context.cpp \
../source/OdfFormat/ods_conversion_context.cpp \
../source/OdfFormat/ods_table_context.cpp \
../source/OdfFormat/ods_table_state.cpp \
../source/OdfFormat/odt_conversion_context.cpp \
../source/OdfFormat/office_annotation.cpp \
../source/OdfFormat/office_body.cpp \
../source/OdfFormat/office_chart.cpp \
../source/OdfFormat/office_elements_create.cpp \
../source/OdfFormat/office_spreadsheet.cpp \
../source/OdfFormat/office_text.cpp \
../source/OdfFormat/oox_shape_defines.cpp \
../source/OdfFormat/paragraph_elements.cpp \
../source/OdfFormat/style_chart_properties.cpp \
../source/OdfFormat/style_graphic_properties.cpp \
../source/OdfFormat/style_map.cpp \
../source/OdfFormat/style_page_layout_properties.cpp \
../source/OdfFormat/style_paragraph_properties.cpp \
../source/OdfFormat/styles.cpp \
../source/OdfFormat/style_section_properties.cpp \
../source/OdfFormat/styles_list.cpp \
../source/OdfFormat/styles_lite_container.cpp \
../source/OdfFormat/style_table_properties.cpp \
../source/OdfFormat/style_text_properties.cpp \
../source/OdfFormat/svg_creator.cpp \
../source/OdfFormat/table.cpp \
../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 \
../../ASCOfficeOdfFile/src/odf/datatypes/anchortype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/backgroundcolor.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/bool.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/bordermodel.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/borderstyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/borderwidths.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/calcext_type.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartdatalabelnumber.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/charterrorcategory.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartinterpolation.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartlabelarrangement.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartregressiontype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartseriessource.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartsolidtype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/chartsymbol.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/clockvalue.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/color.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/direction.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/drawfill.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/dropcaplength.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fillimagerefpoint.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fobreak.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontfamilygeneric.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontpitch.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontrelief.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontsize.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontstretch.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontstyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontvariant.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/fontweight.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/gradientstyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/hatchstyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/hyphenationkeep.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/hyphenationladdercount.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/iconset_type.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/keeptogether.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/layoutgridmode.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/length.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/lengthorpercent.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/letterspacing.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/linebreak.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/linemode.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/linestyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/linetype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/linewidth.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/markerstyle.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/noteclass.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/officevaluetype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/pageusage.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/percent.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/percentorscale.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/presentationclass.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/punctuationwrap.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/rotationalign.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/runthrough.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/scripttype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/shadowtype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/smil_transitiontype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylefamily.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylehorizontalpos.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylehorizontalrel.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/styleleadercolor.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/styleposition.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/style_ref.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylerepeat.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/styletype.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/styleverticalpos.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/styleverticalrel.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylewrap.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/stylewrapcontourmode.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/tablealign.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/tablecentering.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/tablemode.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/tablevisibility.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/targetframename.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textalign.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textalignsource.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textautospace.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textcombine.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textdisplay.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textemphasize.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textposition.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/textrotationscale.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/texttransform.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/underlinecolor.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/verticalalign.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/wrapoption.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/writingmode.cpp \
../../ASCOfficeOdfFile/src/odf/datatypes/xlink.cpp
HEADERS += \
../source/OdfFormat/abstract_xml.h \
../source/OdfFormat/calcext_elements.h \
../source/OdfFormat/draw_base.h \
../source/OdfFormat/draw_frame.h \
../source/OdfFormat/draw_shapes.h \
../source/OdfFormat/header_footer.h \
../source/OdfFormat/list.h \
../source/OdfFormat/mediaitems.h \
../source/OdfFormat/mediaitems_utils.h \
../source/OdfFormat/number_style.h \
../source/OdfFormat/object_package.h \
../source/OdfFormat/odf_chart_context.h \
../source/OdfFormat/odf_comment_context.h \
../source/OdfFormat/odf_conversion_context.h \
../source/OdfFormat/odf_drawing_context.h \
../source/OdfFormat/odf_lists_styles_context.h \
../source/OdfFormat/odf_number_styles_context.h \
../source/OdfFormat/odf_page_layout_context.h \
../source/OdfFormat/odf_page_layout_state.h \
../source/OdfFormat/odf_rels.h \
../source/OdfFormat/odf_style_context.h \
../source/OdfFormat/odf_style_state.h \
../source/OdfFormat/odf_table_context.h \
../source/OdfFormat/odf_table_styles_context.h \
../source/OdfFormat/odf_text_context.h \
../source/OdfFormat/ods_conversion_context.h \
../source/OdfFormat/ods_table_context.h \
../source/OdfFormat/ods_table_state.h \
../source/OdfFormat/odt_conversion_context.h \
../source/OdfFormat/office_annotation.h \
../source/OdfFormat/office_body.h \
../source/OdfFormat/office_chart.h \
../source/OdfFormat/office_elements.h \
../source/OdfFormat/office_elements_create.h \
../source/OdfFormat/office_elements_type.h \
../source/OdfFormat/office_spreadsheet.h \
../source/OdfFormat/office_text.h \
../source/OdfFormat/oox_shape_defines.h \
../source/OdfFormat/paragraph_elements.h \
../source/OdfFormat/style_chart_properties.h \
../source/OdfFormat/style_graphic_properties.h \
../source/OdfFormat/style_map.h \
../source/OdfFormat/style_page_layout_properties.h \
../source/OdfFormat/style_paragraph_properties.h \
../source/OdfFormat/styles.h \
../source/OdfFormat/style_section_properties.h \
../source/OdfFormat/styles_list.h \
../source/OdfFormat/styles_lite_container.h \
../source/OdfFormat/style_table_properties.h \
../source/OdfFormat/style_text_properties.h \
../source/OdfFormat/svg_creator.h \
../source/OdfFormat/table.h \
../source/OdfFormat/table_database_ranges.h \
../source/OdfFormat/table_named_expressions.h \
../source/OdfFormat/text_elements.h \
../source/OdfFormat/visitor.h \
../source/Oox2OdfConverter/Converter.h \
../source/Oox2OdfConverter/DocxConverter.h \
../source/Oox2OdfConverter/Oox2OdfConverter.h \
../source/Oox2OdfConverter/VmlShapeTypes2Oox.h \
../source/Oox2OdfConverter/XlsxConverter.h \
../source/OdfFormat/Shapes/odf_shape_mapping.h \
../source/OdfFormat/Shapes/oox_shapeAccentCallouts.h \
../source/OdfFormat/Shapes/oox_shapeActionButtons.h \
../source/OdfFormat/Shapes/oox_shapeArrows.h \
../source/OdfFormat/Shapes/oox_shapeBents.h \
../source/OdfFormat/Shapes/oox_shapeCallouts.h \
../source/OdfFormat/Shapes/oox_shapeCharts.h \
../source/OdfFormat/Shapes/oox_shapeConnectors.h \
../source/OdfFormat/Shapes/oox_shapeCurvedArrows.h \
../source/OdfFormat/Shapes/oox_shapeCurvedConnectors.h \
../source/OdfFormat/Shapes/oox_shapeCustoms.h \
../source/OdfFormat/Shapes/oox_shapeMaths.h \
../source/OdfFormat/Shapes/oox_shapePrimitives.h \
../source/OdfFormat/Shapes/oox_shapeRibbons.h \
../source/OdfFormat/Shapes/oox_shapeSnipRoundRects.h \
../source/OdfFormat/Shapes/oox_shapeStars.h \
../source/OdfFormat/Shapes/oox_shapeWordArt.h \
../../ASCOfficeOdfFile/src/odf/datatypes/anchortype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/backgroundcolor.h \
../../ASCOfficeOdfFile/src/odf/datatypes/bool.h \
../../ASCOfficeOdfFile/src/odf/datatypes/bordermodel.h \
../../ASCOfficeOdfFile/src/odf/datatypes/borderstyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/borderwidths.h \
../../ASCOfficeOdfFile/src/odf/datatypes/calcext_type.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartdatalabelnumber.h \
../../ASCOfficeOdfFile/src/odf/datatypes/charterrorcategory.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartinterpolation.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartlabelarrangement.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartregressiontype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartseriessource.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartsolidtype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/chartsymbol.h \
../../ASCOfficeOdfFile/src/odf/datatypes/clockvalue.h \
../../ASCOfficeOdfFile/src/odf/datatypes/color.h \
../../ASCOfficeOdfFile/src/odf/datatypes/common_attlists.h \
../../ASCOfficeOdfFile/src/odf/datatypes/custom_shape_types_convert.h \
../../ASCOfficeOdfFile/src/odf/datatypes/direction.h \
../../ASCOfficeOdfFile/src/odf/datatypes/drawfill.h \
../../ASCOfficeOdfFile/src/odf/datatypes/dropcaplength.h \
../../ASCOfficeOdfFile/src/odf/datatypes/errors.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fillimagerefpoint.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fobreak.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontfamilygeneric.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontpitch.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontrelief.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontsize.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontstretch.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontstyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontvariant.h \
../../ASCOfficeOdfFile/src/odf/datatypes/fontweight.h \
../../ASCOfficeOdfFile/src/odf/datatypes/gradientstyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/hatchstyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/hyphenationkeep.h \
../../ASCOfficeOdfFile/src/odf/datatypes/hyphenationladdercount.h \
../../ASCOfficeOdfFile/src/odf/datatypes/iconset_type.h \
../../ASCOfficeOdfFile/src/odf/datatypes/keeptogether.h \
../../ASCOfficeOdfFile/src/odf/datatypes/layoutgridmode.h \
../../ASCOfficeOdfFile/src/odf/datatypes/length.h \
../../ASCOfficeOdfFile/src/odf/datatypes/lengthorpercent.h \
../../ASCOfficeOdfFile/src/odf/datatypes/letterspacing.h \
../../ASCOfficeOdfFile/src/odf/datatypes/linebreak.h \
../../ASCOfficeOdfFile/src/odf/datatypes/linemode.h \
../../ASCOfficeOdfFile/src/odf/datatypes/linestyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/linetype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/linewidth.h \
../../ASCOfficeOdfFile/src/odf/datatypes/markerstyle.h \
../../ASCOfficeOdfFile/src/odf/datatypes/noteclass.h \
../../ASCOfficeOdfFile/src/odf/datatypes/odfattributes.h \
../../ASCOfficeOdfFile/src/odf/datatypes/officevaluetype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/pageusage.h \
../../ASCOfficeOdfFile/src/odf/datatypes/percent.h \
../../ASCOfficeOdfFile/src/odf/datatypes/percentorscale.h \
../../ASCOfficeOdfFile/src/odf/datatypes/presentationclass.h \
../../ASCOfficeOdfFile/src/odf/datatypes/punctuationwrap.h \
../../ASCOfficeOdfFile/src/odf/datatypes/rotationalign.h \
../../ASCOfficeOdfFile/src/odf/datatypes/runthrough.h \
../../ASCOfficeOdfFile/src/odf/datatypes/scripttype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/shadowtype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/smil_transitiontype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylefamily.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylehorizontalpos.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylehorizontalrel.h \
../../ASCOfficeOdfFile/src/odf/datatypes/styleleadercolor.h \
../../ASCOfficeOdfFile/src/odf/datatypes/styleposition.h \
../../ASCOfficeOdfFile/src/odf/datatypes/style_ref.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylerepeat.h \
../../ASCOfficeOdfFile/src/odf/datatypes/styletype.h \
../../ASCOfficeOdfFile/src/odf/datatypes/styleverticalpos.h \
../../ASCOfficeOdfFile/src/odf/datatypes/styleverticalrel.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylewrap.h \
../../ASCOfficeOdfFile/src/odf/datatypes/stylewrapcontourmode.h \
../../ASCOfficeOdfFile/src/odf/datatypes/tablealign.h \
../../ASCOfficeOdfFile/src/odf/datatypes/tablecentering.h \
../../ASCOfficeOdfFile/src/odf/datatypes/tablemode.h \
../../ASCOfficeOdfFile/src/odf/datatypes/tablevisibility.h \
../../ASCOfficeOdfFile/src/odf/datatypes/targetframename.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textalign.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textalignsource.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textautospace.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textcombine.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textdisplay.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textemphasize.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textposition.h \
../../ASCOfficeOdfFile/src/odf/datatypes/textrotationscale.h \
../../ASCOfficeOdfFile/src/odf/datatypes/texttransform.h \
../../ASCOfficeOdfFile/src/odf/datatypes/underlinecolor.h \
../../ASCOfficeOdfFile/src/odf/datatypes/verticalalign.h \
../../ASCOfficeOdfFile/src/odf/datatypes/wrapoption.h \
../../ASCOfficeOdfFile/src/odf/datatypes/writingmode.h \
../../ASCOfficeOdfFile/src/odf/datatypes/xlink.h
unix {
target.path = /usr/lib
INSTALLS += target
}
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
virtual void start_text_context() = 0; virtual void start_text_context() = 0;
virtual void end_text_context() = 0; virtual void end_text_context() = 0;
virtual void start_image(std::wstring & image_file_name) = 0; virtual void start_image(const std::wstring & image_file_name) = 0;
virtual odf_style_context * styles_context(); virtual odf_style_context * styles_context();
...@@ -109,4 +109,4 @@ private: ...@@ -109,4 +109,4 @@ private:
}; };
} }
} }
\ No newline at end of file
...@@ -40,7 +40,7 @@ public: ...@@ -40,7 +40,7 @@ public:
void process_office_styles (office_element_ptr root ); void process_office_styles (office_element_ptr root );
void reset_defaults(); void reset_defaults();
void add_default(odf_style_state_ptr & state) {current_default_styles_.push_back(state);} void add_default(const odf_style_state_ptr & state) {current_default_styles_.push_back(state);}
std::wstring find_odf_style_name_default (style_family::type family); std::wstring find_odf_style_name_default (style_family::type family);
office_element_ptr find_odf_style_default (style_family::type family); office_element_ptr find_odf_style_default (style_family::type family);
......
...@@ -49,7 +49,7 @@ void odf_style_state::add_child(office_element_ptr & child) ...@@ -49,7 +49,7 @@ void odf_style_state::add_child(office_element_ptr & child)
odf_style_->add_child_element(child); odf_style_->add_child_element(child);
} }
void odf_style_state::set_name(std::wstring & name) void odf_style_state::set_name(const std::wstring & name)
{ {
odf_style_name_ = name; odf_style_name_ = name;
...@@ -59,7 +59,7 @@ void odf_style_state::set_name(std::wstring & name) ...@@ -59,7 +59,7 @@ void odf_style_state::set_name(std::wstring & name)
style_->style_name_ = name; style_->style_name_ = name;
} }
void odf_style_state::set_display_name(std::wstring & name) void odf_style_state::set_display_name(const std::wstring & name)
{ {
style* style_ = dynamic_cast<style*>(odf_style_.get()); style* style_ = dynamic_cast<style*>(odf_style_.get());
if (!style_)return; if (!style_)return;
...@@ -79,7 +79,7 @@ style_family::type odf_style_state::get_family_type() ...@@ -79,7 +79,7 @@ style_family::type odf_style_state::get_family_type()
{ {
return style_family_; return style_family_;
} }
void odf_style_state::set_parent_style_name(std::wstring & name) void odf_style_state::set_parent_style_name(const std::wstring & name)
{ {
if (name.length() < 1) return; if (name.length() < 1) return;
......
...@@ -46,7 +46,7 @@ public: ...@@ -46,7 +46,7 @@ public:
void add_child(office_element_ptr & child); void add_child(office_element_ptr & child);
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
void set_name(std::wstring & name); void set_name(const std::wstring & name);
std::wstring get_name(); std::wstring get_name();
style_family::type get_family_type(); style_family::type get_family_type();
...@@ -54,11 +54,11 @@ public: ...@@ -54,11 +54,11 @@ public:
void set_number_format(int id) {num_fmt_id_ = id;} void set_number_format(int id) {num_fmt_id_ = id;}
int get_number_format() {return num_fmt_id_;} int get_number_format() {return num_fmt_id_;}
void set_parent_style_name(std::wstring & name) ; void set_parent_style_name(const std::wstring & name) ;
void set_data_style_name(std::wstring & name); void set_data_style_name(std::wstring & name);
void set_list_style_name(std::wstring & name); void set_list_style_name(std::wstring & name);
void set_display_name(std::wstring & name); void set_display_name(const std::wstring & name);
////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////
style_text_properties * get_text_properties(); style_text_properties * get_text_properties();
style_paragraph_properties * get_paragraph_properties() ; style_paragraph_properties * get_paragraph_properties() ;
......
...@@ -71,11 +71,11 @@ void ods_conversion_context::start_conditional_formats() ...@@ -71,11 +71,11 @@ void ods_conversion_context::start_conditional_formats()
current_table().start_conditional_formats(); current_table().start_conditional_formats();
} }
void ods_conversion_context::add_defined_range(std::wstring & name,std::wstring & cell_range, int sheet_id, bool printable) void ods_conversion_context::add_defined_range(const std::wstring & name,const std::wstring & cell_range, int sheet_id, bool printable)
{ {
table_context_.add_defined_range(name,cell_range, sheet_id, printable); table_context_.add_defined_range(name,cell_range, sheet_id, printable);
} }
void ods_conversion_context::add_defined_expression(std::wstring & name,std::wstring & value, int sheet_id, bool printable) void ods_conversion_context::add_defined_expression(const std::wstring & name,const std::wstring & value, int sheet_id, bool printable)
{ {
table_context_.add_defined_expression(name,value, sheet_id, printable); table_context_.add_defined_expression(name,value, sheet_id, printable);
} }
...@@ -92,7 +92,7 @@ void ods_conversion_context::start_sheet() ...@@ -92,7 +92,7 @@ void ods_conversion_context::start_sheet()
current_table().set_table_master_page(page_layout_context()->last_master().get_name()); current_table().set_table_master_page(page_layout_context()->last_master().get_name());
} }
void ods_conversion_context::set_sheet_dimension(std::wstring & ref) void ods_conversion_context::set_sheet_dimension(const std::wstring & ref)
{ {
std::vector<std::wstring> ref_cells; std::vector<std::wstring> ref_cells;
boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on); boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
...@@ -243,7 +243,7 @@ void ods_conversion_context::add_hyperlink(std::wstring & ref, std::wstring & li ...@@ -243,7 +243,7 @@ void ods_conversion_context::add_hyperlink(std::wstring & ref, std::wstring & li
} }
} }
void ods_conversion_context::add_merge_cells(std::wstring & ref) void ods_conversion_context::add_merge_cells(const std::wstring & ref)
{ {
std::vector<std::wstring> ref_cells; std::vector<std::wstring> ref_cells;
boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on); boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
...@@ -411,7 +411,7 @@ void ods_conversion_context::end_text_context() ...@@ -411,7 +411,7 @@ void ods_conversion_context::end_text_context()
delete current_text_context_; delete current_text_context_;
current_text_context_ = NULL; current_text_context_ = NULL;
} }
void ods_conversion_context::add_text_content(std::wstring & text) void ods_conversion_context::add_text_content(const std::wstring & text)
{ {
if (current_text_context_) if (current_text_context_)
{ {
...@@ -460,7 +460,7 @@ void ods_conversion_context::end_drawings() ...@@ -460,7 +460,7 @@ void ods_conversion_context::end_drawings()
{ {
current_table().drawing_context()->clear(); current_table().drawing_context()->clear();
} }
void ods_conversion_context::start_image(std::wstring & image_file_name) void ods_conversion_context::start_image(const std::wstring & image_file_name)
{ {
std::wstring odf_ref_name ; std::wstring odf_ref_name ;
......
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
virtual void end_document(); virtual void end_document();
void start_sheet(); void start_sheet();
void set_sheet_dimension(std::wstring & ref); void set_sheet_dimension(const std::wstring & ref);
void end_sheet(); void end_sheet();
void start_columns(); void start_columns();
...@@ -49,10 +49,10 @@ public: ...@@ -49,10 +49,10 @@ public:
void end_rows(); void end_rows();
void start_cell_text(); void start_cell_text();
void add_text_content(std::wstring & text); void add_text_content(const std::wstring & text);
void end_cell_text(); void end_cell_text();
void add_merge_cells(std::wstring & ref); void add_merge_cells(const std::wstring & ref);
void add_hyperlink(std::wstring & ref, std::wstring & link, std::wstring & display); void add_hyperlink(std::wstring & ref, std::wstring & link, std::wstring & display);
void start_comment (int col, int row, std::wstring & author); void start_comment (int col, int row, std::wstring & author);
...@@ -70,12 +70,12 @@ public: ...@@ -70,12 +70,12 @@ public:
void start_drawings(); void start_drawings();
void end_drawings(); void end_drawings();
virtual void start_image(std::wstring & image_file_name); virtual void start_image(const std::wstring & image_file_name);
double convert_symbol_width(double val); double convert_symbol_width(double val);
void add_defined_range(std::wstring & name,std::wstring & cell_range, int sheet_id, bool printable = false); void add_defined_range(const std::wstring & name, const std::wstring & cell_range, int sheet_id, bool printable = false);
void add_defined_expression(std::wstring & name,std::wstring & value, int sheet_id, bool printable = false); void add_defined_expression(const std::wstring & name, const std::wstring & value, int sheet_id, bool printable = false);
void start_autofilter(std::wstring ref); void start_autofilter(std::wstring ref);
void end_autofilter(){} void end_autofilter(){}
...@@ -95,4 +95,4 @@ private: ...@@ -95,4 +95,4 @@ private:
} }
} }
\ No newline at end of file
...@@ -50,7 +50,7 @@ void ods_table_context::start_defined_expressions(office_element_ptr & root_elm) ...@@ -50,7 +50,7 @@ void ods_table_context::start_defined_expressions(office_element_ptr & root_elm)
table_defined_expressions_.root = root_elm; table_defined_expressions_.root = root_elm;
} }
void ods_table_context::add_defined_range(std::wstring & name,std::wstring & cell_range, int sheet_id, bool printable) void ods_table_context::add_defined_range(const std::wstring & name, const std::wstring & cell_range, int sheet_id, bool printable)
{ {
office_element_ptr elm; office_element_ptr elm;
create_element(L"table", L"named-range",elm, &context_); create_element(L"table", L"named-range",elm, &context_);
...@@ -96,7 +96,7 @@ void ods_table_context::add_defined_range(std::wstring & name,std::wstring & cel ...@@ -96,7 +96,7 @@ void ods_table_context::add_defined_range(std::wstring & name,std::wstring & cel
} }
} }
void ods_table_context::add_defined_expression(std::wstring & name,std::wstring & value, int sheet_id, bool printable) void ods_table_context::add_defined_expression(const std::wstring & name, const std::wstring & value, int sheet_id, bool printable)
{ {
office_element_ptr elm; office_element_ptr elm;
create_element(L"table", L"named-expression",elm, &context_); create_element(L"table", L"named-expression",elm, &context_);
......
...@@ -38,8 +38,8 @@ public: ...@@ -38,8 +38,8 @@ public:
void start_defined_expressions(office_element_ptr & root_elm); void start_defined_expressions(office_element_ptr & root_elm);
void add_defined_range(std::wstring & name,std::wstring & cell_range, int sheet_id, bool printable = false); void add_defined_range(const std::wstring & name, const std::wstring & cell_range, int sheet_id, bool printable = false);
void add_defined_expression(std::wstring & name,std::wstring & value, int sheet_id, bool printable = false); void add_defined_expression(const std::wstring & name, const std::wstring & value, int sheet_id, bool printable = false);
void start_autofilter(std::wstring ref); void start_autofilter(std::wstring ref);
......
...@@ -29,7 +29,7 @@ int ods_table_state::tmp_row_ =0; ...@@ -29,7 +29,7 @@ int ods_table_state::tmp_row_ =0;
namespace utils//////////////////////////////////////////// .. utils ??? namespace utils//////////////////////////////////////////// .. utils ???
{ {
std::wstring convert_date(std::wstring & oox_date) std::wstring convert_date(const std::wstring & oox_date)
{ {
int iDate = 0; int iDate = 0;
...@@ -53,7 +53,7 @@ std::wstring convert_date(std::wstring & oox_date) ...@@ -53,7 +53,7 @@ std::wstring convert_date(std::wstring & oox_date)
return date_str; return date_str;
} }
std::wstring convert_time(std::wstring & oox_time) std::wstring convert_time(const std::wstring & oox_time)
{ {
double dTime = 0; double dTime = 0;
...@@ -865,7 +865,7 @@ void ods_table_state::set_cell_text(odf_text_context* text_context, bool cash_va ...@@ -865,7 +865,7 @@ void ods_table_state::set_cell_text(odf_text_context* text_context, bool cash_va
// table_cell_properties->style_table_cell_properties_attlist_.style_text_align_source_ = odf::text_align_source(odf::text_align_source::Fix); // table_cell_properties->style_table_cell_properties_attlist_.style_text_align_source_ = odf::text_align_source(odf::text_align_source::Fix);
//} //}
} }
void ods_table_state::set_cell_value(std::wstring & value, bool need_cash) void ods_table_state::set_cell_value(const std::wstring & value, bool need_cash)
{ {
if (cells_size_ < 1)return; if (cells_size_ < 1)return;
......
...@@ -210,7 +210,7 @@ public: ...@@ -210,7 +210,7 @@ public:
void set_cell_format_value(office_value_type::type value_type); void set_cell_format_value(office_value_type::type value_type);
void set_cell_type(int type); void set_cell_type(int type);
void set_cell_value(std::wstring & value, bool need_cash = false); void set_cell_value(const std::wstring & value, bool need_cash = false);
void set_cell_text(odf_text_context *text_context, bool cash_value = false); void set_cell_text(odf_text_context *text_context, bool cash_value = false);
void set_cell_formula(std::wstring &formula); void set_cell_formula(std::wstring &formula);
void set_cell_array_formula(std::wstring & formula, std::wstring ref); void set_cell_array_formula(std::wstring & formula, std::wstring ref);
......
...@@ -149,7 +149,7 @@ void odt_conversion_context::end_text_context() ...@@ -149,7 +149,7 @@ void odt_conversion_context::end_text_context()
text_context_.pop_back(); text_context_.pop_back();
} }
} }
void odt_conversion_context::add_text_content(std::wstring & text) void odt_conversion_context::add_text_content(const std::wstring & text)
{ {
if (drop_cap_state_.enabled) if (drop_cap_state_.enabled)
{ {
...@@ -655,7 +655,7 @@ void odt_conversion_context::end_comment(int oox_comm_id) ...@@ -655,7 +655,7 @@ void odt_conversion_context::end_comment(int oox_comm_id)
text_context()->current_level_.back().elm->add_child_element(comm_elm); text_context()->current_level_.back().elm->add_child_element(comm_elm);
} }
} }
void odt_conversion_context::start_image(std::wstring & image_file_name) void odt_conversion_context::start_image(const std::wstring & image_file_name)
{ {
std::wstring odf_ref_name ; std::wstring odf_ref_name ;
......
...@@ -49,8 +49,8 @@ public: ...@@ -49,8 +49,8 @@ public:
void start_drawings(); void start_drawings();
void end_drawings(); void end_drawings();
virtual void start_image(std::wstring & image_file_name); virtual void start_image(const std::wstring & image_file_name);
void add_text_content (std::wstring & text); void add_text_content (const std::wstring & text);
void start_paragraph(bool styled = false); void start_paragraph(bool styled = false);
void end_paragraph(); void end_paragraph();
...@@ -161,4 +161,4 @@ private: ...@@ -161,4 +161,4 @@ private:
} }
} }
\ No newline at end of file
...@@ -222,7 +222,7 @@ void style_paragraph_properties::create_child_element(const ::std::wstring & Ns, ...@@ -222,7 +222,7 @@ void style_paragraph_properties::create_child_element(const ::std::wstring & Ns,
{ {
style_paragraph_properties_content_.create_child_element(Ns, Name, getContext()); style_paragraph_properties_content_.create_child_element(Ns, Name, getContext());
} }
void style_paragraph_properties::add_child_element( const office_element_ptr & child_element) void style_paragraph_properties::add_child_element(const office_element_ptr & child_element)
{ {
style_paragraph_properties_content_.add_child_element(child_element); style_paragraph_properties_content_.add_child_element(child_element);
} }
......
...@@ -133,7 +133,7 @@ void DocxConverter::convertDocument() ...@@ -133,7 +133,7 @@ void DocxConverter::convertDocument()
{ {
if (!docx_document)return; if (!docx_document)return;
odt_context = new odf::odt_conversion_context(output_document); odt_context = new odf::odt_conversion_context(output_document);
if (!odt_context)return; if (!odt_context)return;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "../OdfFormat/style_paragraph_properties.h" #include "../OdfFormat/style_paragraph_properties.h"
#include "../OdfFormat/style_graphic_properties.h" #include "../OdfFormat/style_graphic_properties.h"
#include "../../../Common/DocxFormat/source/XlsxFormat/Xlsx.h" #include "../../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
using namespace cpdoccore; using namespace cpdoccore;
...@@ -2000,4 +2000,4 @@ void XlsxConverter::convert(OOX::Spreadsheet::CAutofilter *oox_filter) ...@@ -2000,4 +2000,4 @@ void XlsxConverter::convert(OOX::Spreadsheet::CAutofilter *oox_filter)
ods_context->end_autofilter(); ods_context->end_autofilter();
} }
} // namespace Docx2Odt } // namespace Docx2Odt
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment