Skip to content

O
onlyoffice_core
Commit 9e031837 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

x2t собран с конвертацией Open Office форматов (в обе стороны) 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62955 954022d7-b5bf-4e40-9824-e11837661b57
parent 33ef5b44
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 222 deletions
ASCOfficeOdfFile/linux/OdfFileReaderLib.pro
View file @ 9e031837
......@@ -49,7 +49,6 @@ SOURCES += \
../src/odf/draw_frame_pptx.cpp \
../src/odf/draw_frame_xlsx.cpp \
../src/odf/draw_page.cpp \
../src/odf/draw_page_pptx.cpp \
../src/odf/draw_shapes.cpp \
../src/odf/draw_shapes_docx.cpp \
../src/odf/draw_shapes_pptx.cpp \
......
ASCOfficeOdfFile/src/odf/draw_page_pptx.cpp
View file @ 9e031837
......@@ -17,7 +17,10 @@
#include <cpdoccore/xml/simple_xml_writer.h>
namespace cpdoccore {
namespace odf {
using namespace odf_types;
namespace odf_reader {
void draw_page::pptx_convert(oox::pptx_conversion_context & Context)
{
......
ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro
View file @ 9e031837
......@@ -90,97 +90,8 @@ SOURCES += \
../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
../source/Oox2OdfConverter/XlsxConverter.cpp
HEADERS += \
../source/OdfFormat/abstract_xml.h \
......@@ -260,100 +171,8 @@ HEADERS += \
../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
../source/OdfFormat/Shapes/oox_shapeWordArt.h
unix {
target.path = /usr/lib
INSTALLS += target
......
ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.h
View file @ 9e031837
......@@ -48,7 +48,7 @@ public:
virtual void start_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();
......@@ -109,4 +109,4 @@ private:
};
}
}
\ No newline at end of file
}
ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.h
View file @ 9e031837
......@@ -40,7 +40,7 @@ public:
void process_office_styles (office_element_ptr root );
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 (odf_types::style_family::type family);
office_element_ptr find_odf_style_default (odf_types::style_family::type family);
......
ASCOfficeOdfFileW/source/OdfFormat/odf_style_state.cpp
View file @ 9e031837
......@@ -52,7 +52,7 @@ void odf_style_state::add_child(office_element_ptr & child)
odf_style_->add_child_element(child);
}
void odf_style_state::set_name(std::wstring & name)
void odf_style_state::set_name(std::wstring name)
{
odf_style_name_ = name;
......@@ -62,7 +62,7 @@ void odf_style_state::set_name(std::wstring & name)
style_->style_name_ = name;
}
void odf_style_state::set_display_name(std::wstring & name)
void odf_style_state::set_display_name(std::wstring name)
{
style* style_ = dynamic_cast<style*>(odf_style_.get());
if (!style_)return;
......@@ -82,7 +82,7 @@ style_family::type odf_style_state::get_family_type()
{
return style_family_;
}
void odf_style_state::set_parent_style_name(std::wstring & name)
void odf_style_state::set_parent_style_name(std::wstring name)
{
if (name.length() < 1) return;
......@@ -93,7 +93,7 @@ void odf_style_state::set_parent_style_name(std::wstring & name)
return;
style_->style_parent_style_name_ = name;
}
void odf_style_state::set_list_style_name(std::wstring & name)
void odf_style_state::set_list_style_name(std::wstring name)
{
if (name.length() < 1) return;
......@@ -108,7 +108,7 @@ void odf_style_state::set_dont_write(bool Val)
{
writable_ = !Val;
}
void odf_style_state::set_data_style_name(std::wstring & name)
void odf_style_state::set_data_style_name(std::wstring name)
{
style* style_ = dynamic_cast<style*>(odf_style_.get());
if (!style_)return;
......
ASCOfficeOdfFileW/source/OdfFormat/odf_style_state.h
View file @ 9e031837
......@@ -46,7 +46,7 @@ public:
void add_child(office_element_ptr & child);
/////////////////////////////////////////////////////////////////////////////////////////
void set_name(std::wstring & name);
void set_name(std::wstring name);
std::wstring get_name();
odf_types::style_family::type get_family_type();
......@@ -54,11 +54,11 @@ public:
void set_number_format(int id) {num_fmt_id_ = id;}
int get_number_format() {return num_fmt_id_;}
void set_parent_style_name(std::wstring & name) ;
void set_data_style_name(std::wstring & name);
void set_list_style_name(std::wstring & name);
void set_parent_style_name(std::wstring name) ;
void set_data_style_name(std::wstring name);
void set_list_style_name(std::wstring name);
void set_display_name(std::wstring & name);
void set_display_name(std::wstring name);
//////////////////////////////////////////////////////////////////////////////////////////
style_text_properties * get_text_properties();
style_paragraph_properties * get_paragraph_properties() ;
......
ASCOfficeOdfFileW/source/OdfFormat/ods_conversion_context.cpp
View file @ 9e031837
......@@ -74,11 +74,11 @@ void ods_conversion_context::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);
}
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);
}
......@@ -95,7 +95,7 @@ void ods_conversion_context::start_sheet()
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;
boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
......@@ -246,7 +246,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;
boost::algorithm::split(ref_cells,ref, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
......@@ -414,7 +414,7 @@ void ods_conversion_context::end_text_context()
delete current_text_context_;
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_)
{
......@@ -463,7 +463,7 @@ void ods_conversion_context::end_drawings()
{
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 ;
......
ASCOfficeOdfFileW/source/OdfFormat/ods_conversion_context.h
View file @ 9e031837
......@@ -31,7 +31,7 @@ public:
virtual void end_document();
void start_sheet();
void set_sheet_dimension(std::wstring & ref);
void set_sheet_dimension(const std::wstring & ref);
void end_sheet();
void start_columns();
......@@ -49,10 +49,10 @@ public:
void end_rows();
void start_cell_text();
void add_text_content(std::wstring & text);
void add_text_content(const std::wstring & 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 start_comment (int col, int row, std::wstring & author);
......@@ -70,12 +70,12 @@ public:
void start_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);
void add_defined_range(std::wstring & name,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_range(const std::wstring & name, const std::wstring & cell_range, 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 end_autofilter(){}
......@@ -95,4 +95,4 @@ private:
}
}
\ No newline at end of file
}
ASCOfficeOdfFileW/source/OdfFormat/ods_table_context.cpp
View file @ 9e031837
......@@ -53,7 +53,7 @@ void ods_table_context::start_defined_expressions(office_element_ptr & 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;
create_element(L"table", L"named-range",elm, &context_);
......@@ -99,7 +99,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;
create_element(L"table", L"named-expression",elm, &context_);
......
ASCOfficeOdfFileW/source/OdfFormat/ods_table_context.h
View file @ 9e031837
......@@ -38,8 +38,8 @@ public:
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_expression(std::wstring & name,std::wstring & value, 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(const std::wstring & name, const std::wstring & value, int sheet_id, bool printable = false);
void start_autofilter(std::wstring ref);
......
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.cpp
View file @ 9e031837
......@@ -152,7 +152,7 @@ void odt_conversion_context::end_text_context()
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)
{
......@@ -658,7 +658,7 @@ void odt_conversion_context::end_comment(int oox_comm_id)
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 ;
......
ASCOfficeOdfFileW/source/OdfFormat/odt_conversion_context.h
View file @ 9e031837
......@@ -49,8 +49,8 @@ public:
void start_drawings();
void end_drawings();
virtual void start_image(std::wstring & image_file_name);
void add_text_content (std::wstring & text);
virtual void start_image(const std::wstring & image_file_name);
void add_text_content (const std::wstring & text);
void start_paragraph(bool styled = false);
void end_paragraph();
......@@ -161,4 +161,4 @@ private:
}
}
\ 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7