Skip to content

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

..... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62940 954022d7-b5bf-4e40-9824-e11837661b57
parent 89f4f33c
Show whitespace changes
Inline Side-by-side
Showing with 307 additions and 320 deletions
ASCOfficeOdfFileW/source/OdfFormat/abstract_xml.cpp
View file @ e88e98a6
......@@ -24,7 +24,7 @@ void abstract_xml::serialize(std::wostream & strm)
// CP_CREATE_ELEMENT(xml_content_);
//}
//
//void abstract_xml::add_child_element( office_element_ptr & child_element)
//void abstract_xml::add_child_element( const office_element_ptr & child_element)
//{
// xml_content_.push_back(child_element);
//}
......
ASCOfficeOdfFileW/source/OdfFormat/abstract_xml.h
View file @ e88e98a6
......@@ -19,7 +19,7 @@ public:
private:
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp
View file @ e88e98a6
......@@ -42,7 +42,7 @@ void calcext_conditional_formats::create_child_element(const ::std::wstring & Ns
{
CP_CREATE_ELEMENT(content_);
}
void calcext_conditional_formats::add_child_element( office_element_ptr & child_element)
void calcext_conditional_formats::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -69,7 +69,7 @@ void calcext_conditional_format::create_child_element(const ::std::wstring & Ns,
{
CP_CREATE_ELEMENT(content_);
}
void calcext_conditional_format::add_child_element( office_element_ptr & child_element)
void calcext_conditional_format::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -98,7 +98,7 @@ void calcext_data_bar::create_child_element(const ::std::wstring & Ns, const ::s
{
CP_CREATE_ELEMENT(content_);
}
void calcext_data_bar::add_child_element( office_element_ptr & child_element)
void calcext_data_bar::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -126,7 +126,7 @@ void calcext_color_scale::create_child_element(const ::std::wstring & Ns, const
{
CP_CREATE_ELEMENT(content_);
}
void calcext_color_scale::add_child_element( office_element_ptr & child_element)
void calcext_color_scale::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -152,7 +152,7 @@ void calcext_icon_set::create_child_element(const ::std::wstring & Ns, const ::s
{
CP_CREATE_ELEMENT(content_);
}
void calcext_icon_set::add_child_element( office_element_ptr & child_element)
void calcext_icon_set::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.h
View file @ e88e98a6
......@@ -69,7 +69,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -91,7 +91,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -112,7 +112,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -135,7 +135,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -157,7 +157,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -177,7 +177,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -196,7 +196,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -215,7 +215,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -238,7 +238,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/draw_base.cpp
View file @ e88e98a6
......@@ -30,7 +30,7 @@ void draw_base::create_child_element( const ::std::wstring & Ns, const ::std::ws
CP_CREATE_ELEMENT(content_);
}
void draw_base::add_child_element( office_element_ptr & child_element)
void draw_base::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/draw_base.h
View file @ e88e98a6
......@@ -23,7 +23,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
virtual void serialize_attlist(CP_ATTR_NODE);
......
ASCOfficeOdfFileW/source/OdfFormat/draw_frame.cpp
View file @ e88e98a6
......@@ -75,7 +75,7 @@ void draw_image::create_child_element(const ::std::wstring & Ns, const ::std::ws
//CP_NOT_APPLICABLE_ELM();
}
}
void draw_image::add_child_element( office_element_ptr & child_element)
void draw_image::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -115,7 +115,7 @@ void draw_chart::create_child_element( const ::std::wstring & Ns, const ::std::w
CP_CREATE_ELEMENT(content_);
}
void draw_chart::add_child_element( office_element_ptr & child_element)
void draw_chart::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -144,7 +144,7 @@ void draw_g::create_child_element( const ::std::wstring & Ns, const ::std::wstri
{
CP_CREATE_ELEMENT(content_);
}
void draw_g::add_child_element( office_element_ptr & child_element)
void draw_g::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -206,7 +206,7 @@ void draw_frame::create_child_element( const ::std::wstring & Ns, const ::std::
CP_NOT_APPLICABLE_ELM();
}
}
void draw_frame::add_child_element( office_element_ptr & child_element)
void draw_frame::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -263,7 +263,7 @@ void draw_text_box::create_child_element( const ::std::wstring & Ns, const ::st
{
CP_CREATE_ELEMENT(content_);
}
void draw_text_box::add_child_element( office_element_ptr & child_element)
void draw_text_box::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -288,7 +288,7 @@ void draw_object::create_child_element( const ::std::wstring & Ns, const ::std:
{
CP_NOT_APPLICABLE_ELM(); // TODO
}
void draw_object::add_child_element( office_element_ptr & child_element)
void draw_object::add_child_element( const office_element_ptr & child_element)
{
//CP_NOT_APPLICABLE_ELM();
}
......@@ -313,7 +313,7 @@ void draw_object_ole::create_child_element( const ::std::wstring & Ns, const ::s
{
CP_NOT_APPLICABLE_ELM();
}
void draw_object_ole::add_child_element( office_element_ptr & child_element)
void draw_object_ole::add_child_element( const office_element_ptr & child_element)
{
//CP_NOT_APPLICABLE_ELM();
}
......
ASCOfficeOdfFileW/source/OdfFormat/draw_frame.h
View file @ e88e98a6
......@@ -41,7 +41,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -67,7 +67,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -92,7 +92,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -122,7 +122,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -157,7 +157,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -178,7 +178,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -199,7 +199,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.cpp
View file @ e88e98a6
......@@ -165,7 +165,7 @@ void draw_custom_shape::serialize(std::wostream & _Wostream)
}
}
}
void draw_custom_shape::add_child_element( office_element_ptr & child_element)
void draw_custom_shape::add_child_element( const office_element_ptr & child_element)
{
switch(child_element->get_type())
{
......@@ -425,7 +425,7 @@ void draw_enhanced_geometry::create_child_element( const ::std::wstring & Ns, co
}
}
void draw_enhanced_geometry::add_child_element(office_element_ptr & child_element)
void draw_enhanced_geometry::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.h
View file @ e88e98a6
......@@ -196,7 +196,7 @@ public:
static const xml::NodeType xml_type = xml::typeElement;
virtual void serialize(std::wostream & _Wostream);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
office_element_ptr draw_enhanced_geometry_;
};
......@@ -226,7 +226,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -272,7 +272,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -313,7 +313,7 @@ public:
static const xml::NodeType xml_type = xml::typeElement;
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/header_footer.cpp
View file @ e88e98a6
......@@ -54,7 +54,7 @@ void header_footer_content::create_child_element(const ::std::wstring & Ns, cons
{
CP_CREATE_ELEMENT_SIMPLE(content_);
}
void header_footer_content::add_child_element(office_element_ptr & child)
void header_footer_content::add_child_element( const office_element_ptr & child)
{
content_.push_back(child);
}
......
ASCOfficeOdfFileW/source/OdfFormat/header_footer.h
View file @ e88e98a6
......@@ -45,7 +45,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child)
virtual void add_child_element( const office_element_ptr & child)
{
_CP_LOG << L"Non add child in " << ns << L":" << name << std::endl;
}
......@@ -72,7 +72,7 @@ class header_footer_content
{
public:
void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void add_child_element(office_element_ptr & child);
void add_child_element( const office_element_ptr & child);
void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/list.cpp
View file @ e88e98a6
......@@ -69,7 +69,7 @@ void text_list_item::create_child_element(const ::std::wstring & Ns, const ::std
CP_CREATE_ELEMENT(content_);
}
}
void text_list_item::add_child_element( office_element_ptr & child_element)
void text_list_item::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -115,7 +115,7 @@ void text_list_header::create_child_element(const ::std::wstring & Ns, const ::s
CP_CREATE_ELEMENT(content_);
}
}
void text_list_header::add_child_element( office_element_ptr & child_element)
void text_list_header::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/list.h
View file @ e88e98a6
......@@ -22,7 +22,7 @@ public:
text_number() {}
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -52,7 +52,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -86,7 +86,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/number_style.cpp
View file @ e88e98a6
......@@ -90,7 +90,7 @@ void number_style_base::create_child_element( const ::std::wstring & Ns, const :
CP_CREATE_ELEMENT(content_);
}
}
void number_style_base::add_child_element(office_element_ptr & child_element)
void number_style_base::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -213,7 +213,7 @@ void number_number::create_child_element( const ::std::wstring & Ns, const ::std
else
CP_NOT_APPLICABLE_ELM();
}
void number_number::add_child_element(office_element_ptr & child)
void number_number::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/number_style.h
View file @ e88e98a6
......@@ -19,7 +19,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
void serialize(CP_ATTR_NODE);
......@@ -176,7 +176,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp
View file @ e88e98a6
......@@ -782,7 +782,7 @@ void ods_table_state::set_cell_array_formula(std::wstring & formula, std::wstrin
}
}
void ods_table_state::add_child_element(office_element_ptr & child_element)
void ods_table_state::add_child_element( const office_element_ptr & child_element)
{
office_table_->add_child_element(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
View file @ e88e98a6
......@@ -219,7 +219,7 @@ public:
static std::wstring replace_cell_row(boost::wsmatch const & what);
static std::wstring replace_cell_column(boost::wsmatch const & what);
void add_child_element(office_element_ptr & child_element);
void add_child_element( const office_element_ptr & child_element);
void start_conditional_formats();
void start_conditional_format(std::wstring ref);
......
ASCOfficeOdfFileW/source/OdfFormat/office_annotation.cpp
View file @ e88e98a6
......@@ -88,7 +88,7 @@ void office_annotation::create_child_element(const ::std::wstring & Ns, const ::
CP_CREATE_ELEMENT(content_);
}
}
void office_annotation::add_child_element( office_element_ptr & child_element)
void office_annotation::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -150,7 +150,7 @@ void officeooo_annotation::create_child_element( const ::std::wstring & Ns, cons
CP_CREATE_ELEMENT(content_);
}
}
void officeooo_annotation::add_child_element( office_element_ptr & child_element)
void officeooo_annotation::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/office_annotation.h
View file @ e88e98a6
......@@ -49,7 +49,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -71,7 +71,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -93,7 +93,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -120,7 +120,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -147,7 +147,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/office_body.cpp
View file @ e88e98a6
......@@ -27,7 +27,7 @@ void office_body::create_child_element( const ::std::wstring & Ns, const ::std::
}
void office_body::add_child_element( office_element_ptr & child_element)
void office_body::add_child_element( const office_element_ptr & child_element)
{
content_ = child_element;
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_body.h
View file @ e88e98a6
......@@ -30,7 +30,7 @@ public:
office_body();
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/office_chart.cpp
View file @ e88e98a6
......@@ -34,7 +34,7 @@ void office_chart::serialize(std::wostream & _Wostream)
}
}
}
void office_chart::add_child_element(office_element_ptr & child_element)
void office_chart::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -74,7 +74,7 @@ void chart_chart::serialize(std::wostream & _Wostream)
}
}
}
void chart_chart::add_child_element(office_element_ptr & child_element)
void chart_chart::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -114,7 +114,7 @@ void chart_title::serialize(std::wostream & _Wostream)
}
}
}
void chart_title::add_child_element(office_element_ptr & child_element)
void chart_title::add_child_element( const office_element_ptr & child_element)
{
text_p_ = child_element;
}
......@@ -143,7 +143,7 @@ void chart_subtitle::serialize(std::wostream & _Wostream)
}
}
}
void chart_subtitle::add_child_element(office_element_ptr & child_element)
void chart_subtitle::add_child_element( const office_element_ptr & child_element)
{
text_p_ = child_element;
}
......@@ -172,7 +172,7 @@ void chart_footer::serialize(std::wostream & _Wostream)
}
}
}
void chart_footer::add_child_element(office_element_ptr & child_element)
void chart_footer::add_child_element( const office_element_ptr & child_element)
{
text_p_ = child_element;
}
......@@ -244,7 +244,7 @@ void chart_plot_area::serialize(std::wostream & _Wostream)
}
}
}
void chart_plot_area::add_child_element(office_element_ptr & child_element)
void chart_plot_area::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -322,7 +322,7 @@ void chart_axis::serialize(std::wostream & _Wostream)
}
}
}
void chart_axis::add_child_element(office_element_ptr & child_element)
void chart_axis::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -400,7 +400,7 @@ void chart_series::serialize(std::wostream & _Wostream)
}
}
}
void chart_series::add_child_element(office_element_ptr & child_element)
void chart_series::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -496,7 +496,7 @@ void chart_regression_curve::serialize(std::wostream & _Wostream)
}
}
}
void chart_regression_curve::add_child_element(office_element_ptr & child_element)
void chart_regression_curve::add_child_element( const office_element_ptr & child_element)
{
chart_equation_ = child_element;
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_chart.h
View file @ e88e98a6
......@@ -23,7 +23,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -66,7 +66,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -98,7 +98,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -119,7 +119,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -141,7 +141,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -180,7 +180,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -219,7 +219,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -250,7 +250,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -271,7 +271,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -302,7 +302,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -334,7 +334,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -355,7 +355,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -389,7 +389,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -411,7 +411,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -441,7 +441,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -462,7 +462,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -483,7 +483,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -503,7 +503,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}//???
virtual void add_child_element( office_element_ptr & child_element){}//???
virtual void add_child_element( const office_element_ptr & child_element){}//???
virtual void serialize(std::wostream & _Wostream);
......@@ -525,7 +525,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -546,7 +546,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -567,7 +567,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -588,7 +588,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/office_elements.h
View file @ e88e98a6
......@@ -37,7 +37,7 @@ public:
odf_conversion_context * getContext() { return context_; }
const odf_conversion_context * getContext() const { return context_; }
virtual void add_child_element(office_element_ptr & child) = 0;
virtual void add_child_element( const office_element_ptr & child) = 0;
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name)=0;
virtual void add_text(const std::wstring & Text) {}
......@@ -94,7 +94,7 @@ public:
{
return Element::xml_type;
}
virtual void add_child_element( office_element_ptr & child)
virtual void add_child_element( const office_element_ptr & child)
{
_CP_LOG << L"Non add child in " << Element::ns << L":" << Element::name << std::endl;
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_elements_create.cpp
View file @ e88e98a6
......@@ -80,7 +80,7 @@ void not_applicable_element(const std::wstring & Current,const std::wstring & Ns
if (!Current.empty())
ss << L" ("<< Current << ")";
ss << L"\n";
_CP_LOG(error) << ss.str();
_CP_LOG << ss.str();
#endif
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_spreadsheet.cpp
View file @ e88e98a6
......@@ -23,7 +23,7 @@ void office_spreadsheet::create_child_element(const ::std::wstring & Ns, const :
CP_CREATE_ELEMENT(content_);
}
void office_spreadsheet::add_child_element(office_element_ptr & child_element)
void office_spreadsheet::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_spreadsheet.h
View file @ e88e98a6
......@@ -26,7 +26,7 @@ public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
private:
......
ASCOfficeOdfFileW/source/OdfFormat/office_text.cpp
View file @ e88e98a6
......@@ -71,7 +71,7 @@ void office_text::create_child_element( const ::std::wstring & Ns, const ::std::
CP_NOT_APPLICABLE_ELM();
}
void office_text::add_child_element(office_element_ptr & child_element)
void office_text::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/office_text.h
View file @ e88e98a6
......@@ -34,7 +34,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/paragraph_elements.cpp
View file @ e88e98a6
......@@ -225,7 +225,7 @@ void text_span::create_child_element( const ::std::wstring & Ns, const ::std::ws
{
CP_CREATE_ELEMENT(paragraph_content_);
}
void text_span::add_child_element( office_element_ptr & child_element)
void text_span::add_child_element( const office_element_ptr & child_element)
{
paragraph_content_.push_back(child_element);
}
......@@ -266,7 +266,7 @@ void text_a::create_child_element( const ::std::wstring & Ns, const ::std::wstri
CP_CREATE_ELEMENT(paragraph_content_);
}
void text_a::add_child_element( office_element_ptr & child_element)
void text_a::add_child_element( const office_element_ptr & child_element)
{
paragraph_content_.push_back(child_element);
}
......@@ -316,7 +316,7 @@ void text_note::create_child_element( const ::std::wstring & Ns, const ::std::w
else
CP_NOT_APPLICABLE_ELM();
}
void text_note::add_child_element( office_element_ptr & child_element)
void text_note::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -368,7 +368,7 @@ void text_ruby::create_child_element( const ::std::wstring & Ns, const ::std::ws
else
CP_NOT_APPLICABLE_ELM();
}
void text_ruby::add_child_element( office_element_ptr & child_element)
void text_ruby::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -404,7 +404,7 @@ void text_title::create_child_element( const ::std::wstring & Ns, const ::std::w
{
}
void text_title::add_child_element( office_element_ptr & child_element)
void text_title::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -438,7 +438,7 @@ void text_placeholder::create_child_element( const ::std::wstring & Ns, const ::
{
}
void text_placeholder::add_child_element( office_element_ptr & child_element)
void text_placeholder::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......@@ -480,7 +480,7 @@ void text_page_number::create_child_element( const ::std::wstring & Ns, const ::
CP_CREATE_ELEMENT(text_);
}
void text_page_number::add_child_element( office_element_ptr & child_element)
void text_page_number::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -516,7 +516,7 @@ void text_page_count::create_child_element(const ::std::wstring & Ns, const ::st
CP_CREATE_ELEMENT(text_);
}
void text_page_count::add_child_element( office_element_ptr & child_element)
void text_page_count::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -552,7 +552,7 @@ void text_date::create_child_element(const ::std::wstring & Ns, const ::std::wst
{
CP_CREATE_ELEMENT(text_);
}
void text_date::add_child_element( office_element_ptr & child_element)
void text_date::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -594,7 +594,7 @@ void text_time::create_child_element( const ::std::wstring & Ns, const ::std::ws
CP_CREATE_ELEMENT(text_);
}
void text_time::add_child_element( office_element_ptr & child_element)
void text_time::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -633,7 +633,7 @@ void text_file_name::create_child_element( const ::std::wstring & Ns, const ::st
CP_CREATE_ELEMENT(text_);
}
void text_file_name::add_child_element( office_element_ptr & child_element)
void text_file_name::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -667,7 +667,7 @@ void text_sequence::create_child_element(const ::std::wstring & Ns, const ::std:
{
CP_CREATE_ELEMENT(text_);
}
void text_sequence::add_child_element( office_element_ptr & child_element)
void text_sequence::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......@@ -687,7 +687,7 @@ void text_sheet_name::create_child_element(const ::std::wstring & Ns, const ::st
{
CP_NOT_APPLICABLE_ELM();
}
void text_sheet_name::add_child_element( office_element_ptr & child_element)
void text_sheet_name::add_child_element( const office_element_ptr & child_element)
{
text_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/paragraph_elements.h
View file @ e88e98a6
......@@ -32,7 +32,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -59,7 +59,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -83,7 +83,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -109,7 +109,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -136,7 +136,7 @@ public:
text_bookmark(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -161,7 +161,7 @@ public:
text_bookmark_start(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -186,7 +186,7 @@ public:
text_bookmark_end(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -211,7 +211,7 @@ public:
text_reference_mark(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -236,7 +236,7 @@ public:
text_reference_mark_start(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -261,7 +261,7 @@ public:
text_reference_mark_end(const ::std::wstring & Name) : text_name_(Name){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -283,7 +283,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -313,7 +313,7 @@ public:
public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -349,7 +349,7 @@ public:
public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -380,7 +380,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -418,7 +418,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -444,7 +444,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -467,7 +467,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -497,7 +497,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -523,7 +523,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -552,7 +552,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -581,7 +581,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -609,7 +609,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -634,7 +634,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -659,7 +659,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -679,7 +679,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/style_chart_properties.h
View file @ e88e98a6
......@@ -103,7 +103,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
chart_format_properties & content() { return chart_format_properties_; }
......
ASCOfficeOdfFileW/source/OdfFormat/style_graphic_properties.h
View file @ e88e98a6
......@@ -130,7 +130,7 @@ public:
graphic_format_properties & content(){ return graphic_format_properties_; }
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/style_page_layout_properties.cpp
View file @ e88e98a6
......@@ -58,7 +58,7 @@ void style_page_layout_properties::create_child_element( const ::std::wstring &
style_page_layout_properties_elements_.create_child_element( Ns, Name, getContext());
}
void style_page_layout_properties::add_child_element( office_element_ptr & child)
void style_page_layout_properties::add_child_element( const office_element_ptr & child)
{
style_page_layout_properties_elements_.add_child_element(child);
}
......@@ -95,7 +95,7 @@ void style_page_layout_properties_elements::create_child_element( const ::std::w
not_applicable_element(L"style-page-layout-properties-elements", Ns, Name);
}
}
void style_page_layout_properties_elements::add_child_element( office_element_ptr & child )
void style_page_layout_properties_elements::add_child_element( const office_element_ptr & child )
{
if (!child)return;
......
ASCOfficeOdfFileW/source/OdfFormat/style_page_layout_properties.h
View file @ e88e98a6
......@@ -73,7 +73,7 @@ class style_page_layout_properties_elements
{
public:
void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void add_child_element(office_element_ptr & child);
void add_child_element( const office_element_ptr & child);
void serialize(std::wostream & strm);
office_element_ptr style_background_image_;
......@@ -97,7 +97,7 @@ public:
style_page_layout_properties() { }
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.cpp
View file @ e88e98a6
......@@ -59,7 +59,7 @@ void style_tab_stops::serialize(std::wostream & strm)
}
}
}
void style_tab_stops::add_child_element( office_element_ptr & child_element)
void style_tab_stops::add_child_element( const office_element_ptr & child_element)
{
style_tab_stops_.push_back(child_element);
}
......@@ -127,7 +127,7 @@ void paragraph_format_properties::create_child_element(const ::std::wstring & Ns
// CP_NOT_APPLICABLE_ELM();
}
}
void paragraph_format_properties::add_child_element( office_element_ptr & child_element)
void paragraph_format_properties::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.h
View file @ e88e98a6
......@@ -57,7 +57,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......@@ -91,7 +91,7 @@ public:
size_t size() const { return style_tab_stops_.size(); }
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -112,7 +112,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......@@ -139,7 +139,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......@@ -160,7 +160,7 @@ class paragraph_format_properties
{
public:
void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name,odf_conversion_context * Context);
void add_child_element(office_element_ptr & child);
void add_child_element( const office_element_ptr & child);
void serialize(std::wostream & strm, const wchar_t * ns, const wchar_t * name );
......@@ -344,7 +344,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
void apply_from(style_paragraph_properties * Other);
......
ASCOfficeOdfFileW/source/OdfFormat/style_section_properties.cpp
View file @ e88e98a6
......@@ -30,7 +30,7 @@ void style_columns::create_child_element( const ::std::wstring & Ns, const ::std
CP_NOT_APPLICABLE_ELM();
}
}
void style_columns::add_child_element(office_element_ptr & child)
void style_columns::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -128,7 +128,7 @@ void style_section_properties::create_child_element( const ::std::wstring & Ns,
CP_NOT_APPLICABLE_ELM();
}
}
void style_section_properties::add_child_element(office_element_ptr & child)
void style_section_properties::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......
ASCOfficeOdfFileW/source/OdfFormat/style_section_properties.h
View file @ e88e98a6
......@@ -25,7 +25,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -50,7 +50,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
_CP_OPT(length) style_rel_width_;
......@@ -74,7 +74,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......@@ -98,7 +98,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/style_table_properties.h
View file @ e88e98a6
......@@ -71,7 +71,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
void apply_from(const style_table_properties * Other);
......
ASCOfficeOdfFileW/source/OdfFormat/style_text_properties.h
View file @ e88e98a6
......@@ -186,7 +186,7 @@ public:
void apply_from(const style_text_properties * Other);
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child){}
virtual void add_child_element( const office_element_ptr & child){}
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/styles.cpp
View file @ e88e98a6
......@@ -107,7 +107,7 @@ style_chart_properties * style_content::get_style_chart_properties()
// return dynamic_cast<style_drawing_page_properties *>(style_drawing_page_properties_.get());
//}
void style_content::add_child_element(office_element_ptr & child)
void style_content::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -201,7 +201,7 @@ void default_style::create_child_element( const ::std::wstring & Ns, const ::std
{
style_content_.create_child_element(Ns, Name);
}
void default_style::add_child_element(office_element_ptr & child)
void default_style::add_child_element( const office_element_ptr & child)
{
style_content_.add_child_element(child);
}
......@@ -360,7 +360,7 @@ void style::create_child_element( const ::std::wstring & Ns, const ::std::wstri
style_content_.create_child_element(Ns, Name);
}
void style::add_child_element(office_element_ptr & child)
void style::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -424,7 +424,7 @@ void styles::create_child_element( const ::std::wstring & Ns, const ::std::wstr
CP_NOT_APPLICABLE_ELM_SIMPLE(L"styles");
}
}
void styles::add_child_element(office_element_ptr & child, odf_conversion_context * Context)
void styles::add_child_element( const office_element_ptr & child, odf_conversion_context * Context)
{
if (!child)return;
......@@ -470,7 +470,7 @@ void templates::create_child_element( const ::std::wstring & Ns, const ::std::ws
CP_CREATE_ELEMENT_SIMPLE(table_templates_);
}
}
void templates::add_child_element(office_element_ptr & child)
void templates::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -520,7 +520,7 @@ void draw_styles::create_child_element(const ::std::wstring & Ns, const ::std::w
}
}
void draw_styles::add_child_element(office_element_ptr & child, odf_conversion_context * Context)
void draw_styles::add_child_element( const office_element_ptr & child, odf_conversion_context * Context)
{
if (!child)return;
......@@ -581,7 +581,7 @@ void office_automatic_styles::create_child_element( const ::std::wstring & Ns, c
}
}
void office_automatic_styles::add_child_element(office_element_ptr & child)
void office_automatic_styles::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -641,7 +641,7 @@ void office_master_styles::create_child_element( const ::std::wstring & Ns, cons
}
}
void office_master_styles::add_child_element(office_element_ptr & child)
void office_master_styles::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -736,7 +736,7 @@ void office_styles::create_child_element( const ::std::wstring & Ns, const ::std
CP_NOT_APPLICABLE_ELM();
}
}
void office_styles::add_child_element(office_element_ptr & child)
void office_styles::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -803,7 +803,7 @@ void style_header::create_child_element( const ::std::wstring & Ns, const ::std
{
content().header_footer_content_.create_child_element( Ns, Name, getContext());
}
void style_header::add_child_element(office_element_ptr & child)
void style_header::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element( child);
}
......@@ -826,7 +826,7 @@ void style_footer::create_child_element( const ::std::wstring & Ns, const ::std
{
content().header_footer_content_.create_child_element(Ns, Name, getContext());
}
void style_footer::add_child_element(office_element_ptr & child)
void style_footer::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element( child);
}
......@@ -848,7 +848,7 @@ void style_header_first::create_child_element(const ::std::wstring & Ns, const :
{
content().header_footer_content_.create_child_element(Ns, Name, getContext());
}
void style_header_first::add_child_element(office_element_ptr & child)
void style_header_first::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element(child);
}
......@@ -870,7 +870,7 @@ void style_footer_first::create_child_element( const ::std::wstring & Ns, const
{
content().header_footer_content_.create_child_element( Ns, Name, getContext());
}
void style_footer_first::add_child_element( office_element_ptr & child)
void style_footer_first::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element( child);
}
......@@ -892,7 +892,7 @@ void style_header_left::create_child_element(const ::std::wstring & Ns, const ::
{
content().header_footer_content_.create_child_element( Ns, Name, getContext());
}
void style_header_left::add_child_element(office_element_ptr & child)
void style_header_left::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element( child);
}
......@@ -915,7 +915,7 @@ void style_footer_left::create_child_element( const ::std::wstring & Ns, const
{
content().header_footer_content_.create_child_element( Ns, Name, getContext());
}
void style_footer_left::add_child_element(office_element_ptr & child)
void style_footer_left::add_child_element( const office_element_ptr & child)
{
content().header_footer_content_.add_child_element(child);
}
......@@ -946,7 +946,7 @@ void style_header_style::create_child_element(const ::std::wstring & Ns, const :
CP_NOT_APPLICABLE_ELM();
}
}
void style_header_style::add_child_element(office_element_ptr & child)
void style_header_style::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -982,7 +982,7 @@ void style_footer_style::create_child_element( const ::std::wstring & Ns, const
CP_NOT_APPLICABLE_ELM();
}
}
void style_footer_style::add_child_element(office_element_ptr & child)
void style_footer_style::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -1031,7 +1031,7 @@ void style_page_layout::create_child_element( const ::std::wstring & Ns, const
CP_NOT_APPLICABLE_ELM();
}
}
void style_page_layout::add_child_element( office_element_ptr & child)
void style_page_layout::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......@@ -1130,7 +1130,7 @@ void style_master_page::create_child_element(const ::std::wstring & Ns, const ::
}
}
void style_master_page::add_child_element(office_element_ptr & child)
void style_master_page::add_child_element( const office_element_ptr & child)
{
if (!child)return;
......
ASCOfficeOdfFileW/source/OdfFormat/styles.h
View file @ e88e98a6
......@@ -58,7 +58,7 @@ public:
style_content(odf_conversion_context * _context){Context = _context;}
void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
void add_child_element(office_element_ptr & child);
void add_child_element( const office_element_ptr & child);
void serialize(std::wostream & strm);
style_text_properties * get_style_text_properties();
......@@ -105,7 +105,7 @@ public:
default_style() : style_content_(getContext()) {}
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -280,7 +280,7 @@ public:
style() : style_content_(getContext()) {}
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -311,7 +311,7 @@ class styles
{
public:
void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void add_child_element(office_element_ptr & child, odf_conversion_context * Context);
void add_child_element( const office_element_ptr & child, odf_conversion_context * Context);
void serialize(std::wostream & strm);
......@@ -332,7 +332,7 @@ class draw_styles
{
public:
void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void add_child_element(office_element_ptr & child, odf_conversion_context * Context);
void add_child_element( const office_element_ptr & child, odf_conversion_context * Context);
void serialize(std::wostream & strm);
......@@ -352,7 +352,7 @@ class templates
{
public:
void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void add_child_element(office_element_ptr & child);
void add_child_element( const office_element_ptr & child);
void serialize(std::wostream & strm);
......@@ -372,7 +372,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -394,7 +394,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -438,7 +438,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -475,7 +475,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -525,7 +525,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -547,7 +547,7 @@ public:
virtual void serialize(std::wostream & strm);
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
header_footer_content_common content_;
......@@ -568,7 +568,7 @@ public:
virtual void serialize(std::wostream & strm);
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
header_footer_content_common content_;
};
......@@ -586,7 +586,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -606,7 +606,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -626,7 +626,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -657,7 +657,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -679,7 +679,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -705,7 +705,7 @@ public:
office_element_ptr style_footer_style_;
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
};
......
ASCOfficeOdfFileW/source/OdfFormat/styles_list.cpp
View file @ e88e98a6
......@@ -62,7 +62,7 @@ void text_list_style::create_child_element( const ::std::wstring & Ns, const ::s
CP_NOT_APPLICABLE_ELM();
}
}
void text_list_style::add_child_element( office_element_ptr & child)
void text_list_style::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......@@ -101,7 +101,7 @@ void text_list_level_style_number::create_child_element(const ::std::wstring & N
CP_NOT_APPLICABLE_ELM();
}
}
void text_list_level_style_number::add_child_element( office_element_ptr & child)
void text_list_level_style_number::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......@@ -143,7 +143,7 @@ void style_list_level_properties::create_child_element( const ::std::wstring & N
CP_NOT_APPLICABLE_ELM();
}
}
void style_list_level_properties::add_child_element( office_element_ptr & child)
void style_list_level_properties::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......@@ -187,7 +187,7 @@ void style_list_level_label_alignment::create_child_element(const ::std::wstring
{
CP_NOT_APPLICABLE_ELM();
}
void style_list_level_label_alignment::add_child_element( office_element_ptr & child)
void style_list_level_label_alignment::add_child_element( const office_element_ptr & child)
{
// CP_NOT_APPLICABLE_ELM();
}
......@@ -223,7 +223,7 @@ void text_list_level_style_bullet::create_child_element( const ::std::wstring &
CP_NOT_APPLICABLE_ELM();
}
}
void text_list_level_style_bullet::add_child_element( office_element_ptr & child)
void text_list_level_style_bullet::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......@@ -267,7 +267,7 @@ void text_list_level_style_image::create_child_element( const ::std::wstring &
CP_NOT_APPLICABLE_ELM();
}
}
void text_list_level_style_image::add_child_element( office_element_ptr & child)
void text_list_level_style_image::add_child_element( const office_element_ptr & child)
{
ElementType type = child->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/styles_list.h
View file @ e88e98a6
......@@ -39,7 +39,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
text_list_style_attr text_list_style_attr_;
......@@ -91,7 +91,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
_CP_OPT(length) text_space_before_;
......@@ -125,7 +125,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
_CP_OPT(std::wstring) text_label_followed_by_;
......@@ -156,7 +156,7 @@ public:
office_element_ptr style_list_level_properties_;
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
text_list_level_style_attr text_list_level_style_attr_;
......@@ -193,7 +193,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......@@ -227,7 +227,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element( const std::wstring & Ns, const std::wstring & Name);
virtual void add_child_element(office_element_ptr & child);
virtual void add_child_element( const office_element_ptr & child);
virtual void serialize(std::wostream & strm);
......
ASCOfficeOdfFileW/source/OdfFormat/table.cpp
View file @ e88e98a6
......@@ -94,7 +94,7 @@ void table_table_source::create_child_element(const ::std::wstring & Ns, const :
{
CP_NOT_APPLICABLE_ELM();
}
void table_table_source::add_child_element( office_element_ptr & child_element)
void table_table_source::add_child_element( const office_element_ptr & child_element)
{
}
void table_table_source::serialize(std::wostream & _Wostream)
......@@ -148,7 +148,7 @@ void table_table::create_child_element(const ::std::wstring & Ns, const ::std::w
}
void table_table::add_child_element(office_element_ptr & child_element)
void table_table::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -213,7 +213,7 @@ void table_table_column::create_child_element( const ::std::wstring & Ns, const
{
CP_NOT_APPLICABLE_ELM();
}
void table_table_column::add_child_element(office_element_ptr & child_element)
void table_table_column::add_child_element( const office_element_ptr & child_element)
{
}
void table_table_column::serialize(std::wostream & _Wostream)
......@@ -241,7 +241,7 @@ void table_table_columns::create_child_element(const ::std::wstring & Ns, const
else
CP_NOT_APPLICABLE_ELM();
}
void table_table_columns::add_child_element(office_element_ptr & child_element)
void table_table_columns::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -276,7 +276,7 @@ void table_table_header_columns::create_child_element( const ::std::wstring & Ns
else
CP_NOT_APPLICABLE_ELM();
}
void table_table_header_columns::add_child_element(office_element_ptr & child_element)
void table_table_header_columns::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -312,7 +312,7 @@ void table_columns::create_child_element( const ::std::wstring & Ns, const ::std
else
not_applicable_element(L"table-columns", Ns, Name);
}
void table_columns::add_child_element(office_element_ptr & child_element)
void table_columns::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -364,7 +364,7 @@ void table_columns_no_group::create_child_element( const ::std::wstring & Ns, c
else
not_applicable_element(L"table-columns-no-group", Ns, Name);
}
void table_columns_no_group::add_child_element(office_element_ptr & child_element)
void table_columns_no_group::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -410,7 +410,7 @@ void table_table_column_group::create_child_element( const ::std::wstring & Ns,
{
table_columns_and_groups_.create_child_element(Ns, Name, getContext());
}
void table_table_column_group::add_child_element(office_element_ptr & child_element)
void table_table_column_group::add_child_element( const office_element_ptr & child_element)
{
table_columns_and_groups_.add_child_element(child_element,getContext());
}
......@@ -453,7 +453,7 @@ void table_columns_and_groups::create_child_element(const ::std::wstring & Ns, c
not_applicable_element(L"table-columns-and-groups", Ns, Name);
}
void table_columns_and_groups::add_child_element(office_element_ptr & child_element, odf_conversion_context * Context)
void table_columns_and_groups::add_child_element( const office_element_ptr & child_element, odf_conversion_context * Context)
{
ElementType type = child_element->get_type();
......@@ -489,7 +489,7 @@ void table_table_cell_content::create_child_element( const ::std::wstring & Ns,
{
CP_CREATE_ELEMENT_SIMPLE(text_content_);
}
void table_table_cell_content::add_child_element( office_element_ptr & child_element)
void table_table_cell_content::add_child_element( const office_element_ptr & child_element)
{
text_content_.push_back(child_element);
}
......@@ -511,7 +511,7 @@ void table_table_cell::create_child_element( const ::std::wstring & Ns, const ::
table_table_cell_content_.create_child_element(Ns, Name, getContext());
}
void table_table_cell::add_child_element(office_element_ptr & child_element)
void table_table_cell::add_child_element( const office_element_ptr & child_element)
{
table_table_cell_content_.add_child_element(child_element);
}
......@@ -539,7 +539,7 @@ void table_covered_table_cell::create_child_element( const ::std::wstring & Ns,
empty_ = false;
table_table_cell_content_.create_child_element( Ns, Name, getContext());
}
void table_covered_table_cell::add_child_element(office_element_ptr & child_element)
void table_covered_table_cell::add_child_element( const office_element_ptr & child_element)
{
empty_ = false;
table_table_cell_content_.add_child_element(child_element);
......@@ -572,7 +572,7 @@ void table_table_row::create_child_element( const ::std::wstring & Ns, const ::s
else
CP_NOT_APPLICABLE_ELM();
}
void table_table_row::add_child_element(office_element_ptr & child_element)
void table_table_row::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -604,7 +604,7 @@ void table_table_rows::create_child_element( const ::std::wstring & Ns, const :
{
CP_CREATE_ELEMENT(table_table_row_);
}
void table_table_rows::add_child_element(office_element_ptr & child_element)
void table_table_rows::add_child_element( const office_element_ptr & child_element)
{
table_table_row_.push_back(child_element);
}
......@@ -636,7 +636,7 @@ void table_table_header_rows::create_child_element( const ::std::wstring & Ns, c
else
CP_NOT_APPLICABLE_ELM();
}
void table_table_header_rows::add_child_element(office_element_ptr & child_element)
void table_table_header_rows::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -673,7 +673,7 @@ void table_rows::create_child_element(const ::std::wstring & Ns, const ::std::ws
not_applicable_element(L"table-rows", Ns, Name);
}
}
void table_rows::add_child_element(office_element_ptr & child_element)
void table_rows::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -725,7 +725,7 @@ void table_rows_no_group::create_child_element( const ::std::wstring & Ns, const
else
not_applicable_element(L"table-rows-no-group",Ns, Name);
}
void table_rows_no_group::add_child_element(office_element_ptr & child_element)
void table_rows_no_group::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -780,7 +780,7 @@ void table_rows_and_groups::create_child_element( const ::std::wstring & Ns, con
else
not_applicable_element(L"table-rows-and-groups", Ns, Name);
}
void table_rows_and_groups::add_child_element(office_element_ptr & child_element, odf_conversion_context * Context)
void table_rows_and_groups::add_child_element( const office_element_ptr & child_element, odf_conversion_context * Context)
{
ElementType type = child_element->get_type();
......@@ -814,7 +814,7 @@ void table_table_row_group::create_child_element(const ::std::wstring & Ns, cons
table_rows_and_groups_.create_child_element(Ns, Name, getContext());
}
void table_table_row_group::add_child_element(office_element_ptr & child_element)
void table_table_row_group::add_child_element( const office_element_ptr & child_element)
{
table_rows_and_groups_.add_child_element(child_element, getContext());
}
......@@ -844,7 +844,7 @@ void table_shapes::create_child_element(const ::std::wstring & Ns, const ::std::
create_element(Ns,Name,content_,getContext());
}
void table_shapes::add_child_element(office_element_ptr & child_element)
void table_shapes::add_child_element( const office_element_ptr & child_element)
{
content_.push_back(child_element);
}
......
ASCOfficeOdfFileW/source/OdfFormat/table.h
View file @ e88e98a6
......@@ -138,7 +138,7 @@ public:
table_linked_source_attlist table_linked_source_attlist_;
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -151,7 +151,7 @@ class table_columns
{
public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -177,7 +177,7 @@ public:
table_columns_no_group(odf_conversion_context * _Context);
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name/*, odf_conversion_context * Context*/);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -202,7 +202,7 @@ public:
table_columns_and_groups();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
virtual void add_child_element( office_element_ptr & child_element, odf_conversion_context * Context);
virtual void add_child_element( const office_element_ptr & child_element, odf_conversion_context * Context);
virtual void serialize(std::wostream & _Wostream);
public:
......@@ -241,7 +241,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -266,7 +266,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -290,7 +290,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -323,7 +323,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -352,7 +352,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -369,7 +369,7 @@ class table_table_cell_content
{
public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
private:
......@@ -395,7 +395,7 @@ public:
table_table_cell() { }
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -423,7 +423,7 @@ public:
table_covered_table_cell() {empty_ = true; }
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -449,7 +449,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -477,7 +477,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -493,7 +493,7 @@ class table_rows
{
public:
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -520,7 +520,7 @@ public:
table_rows_no_group(odf_conversion_context * Context);
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -543,7 +543,7 @@ public:
table_rows_and_groups();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
virtual void add_child_element( office_element_ptr & child_element, odf_conversion_context * Context);
virtual void add_child_element( const office_element_ptr & child_element, odf_conversion_context * Context);
virtual void serialize(std::wostream & _Wostream);
......@@ -579,7 +579,7 @@ public:
{
}
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -604,7 +604,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -637,7 +637,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/table_database_ranges.cpp
View file @ e88e98a6
......@@ -28,7 +28,7 @@ void table_database_ranges::create_child_element(const ::std::wstring & Ns, cons
}
}
void table_database_ranges::add_child_element(office_element_ptr & child_element)
void table_database_ranges::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/table_database_ranges.h
View file @ e88e98a6
......@@ -25,7 +25,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -47,7 +47,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -74,7 +74,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_database_range);
// CPDOCCORE_DEFINE_VISITABLE()
//
// virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
// virtual void add_child_element( office_element_ptr & child_element){}
// virtual void add_child_element( const office_element_ptr & child_element){}
//
// virtual void serialize(std::wostream & _Wostream);
//
......
ASCOfficeOdfFileW/source/OdfFormat/table_named_expressions.cpp
View file @ e88e98a6
......@@ -32,7 +32,7 @@ void table_named_expressions::create_child_element(const ::std::wstring & Ns, co
}
}
void table_named_expressions::add_child_element(office_element_ptr & child_element)
void table_named_expressions::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......
ASCOfficeOdfFileW/source/OdfFormat/table_named_expressions.h
View file @ e88e98a6
......@@ -23,7 +23,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -46,7 +46,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -73,7 +73,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE();
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/OdfFormat/text_elements.cpp
View file @ e88e98a6
......@@ -32,7 +32,7 @@ void paragraph::create_child_element( const ::std::wstring & Ns, const ::std::ws
CP_CREATE_ELEMENT_SIMPLE(paragraph_content_);
}
void paragraph::add_child_element( office_element_ptr & child_element)
void paragraph::add_child_element( const office_element_ptr & child_element)
{
paragraph_content_.push_back(child_element);
}
......@@ -101,7 +101,7 @@ void text_h::add_text(const std::wstring & Text)
{
paragraph_.add_text(Text);
}
void text_h::add_child_element( office_element_ptr & child_element)
void text_h::add_child_element( const office_element_ptr & child_element)
{
paragraph_.add_child_element(child_element);
}
......@@ -114,7 +114,7 @@ void text_p::create_child_element(const ::std::wstring & Ns, const ::std::wstrin
{
paragraph_.create_child_element( Ns, Name, getContext());
}
void text_p::add_child_element( office_element_ptr & child_element)
void text_p::add_child_element( const office_element_ptr & child_element)
{
paragraph_.add_child_element(child_element);
}
......@@ -171,7 +171,7 @@ void text_list::create_child_element(const ::std::wstring & Ns, const ::std::wst
CP_CREATE_ELEMENT(text_list_items_);
}
}
void text_list::add_child_element( office_element_ptr & child_element)
void text_list::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -223,7 +223,7 @@ void text_section::create_child_element( const ::std::wstring & Ns, const ::std:
}
}
void text_section::add_child_element( office_element_ptr & child_element)
void text_section::add_child_element( const office_element_ptr & child_element)
{
ElementType type = child_element->get_type();
......@@ -305,7 +305,7 @@ void text_index_body::create_child_element(const ::std::wstring & Ns, const ::st
CP_CREATE_ELEMENT(index_content_main_);
}
void text_index_body::add_child_element( office_element_ptr & child_element)
void text_index_body::add_child_element( const office_element_ptr & child_element)
{
index_content_main_.push_back(child_element);
}
......@@ -332,7 +332,7 @@ void text_index_title::create_child_element(const ::std::wstring & Ns, const ::s
{
CP_CREATE_ELEMENT(index_content_main_);
}
void text_index_title::add_child_element( office_element_ptr & child_element)
void text_index_title::add_child_element( const office_element_ptr & child_element)
{
index_content_main_.push_back(child_element);
}
......@@ -362,7 +362,7 @@ void text_table_of_content::create_child_element( const ::std::wstring & Ns, con
}
}
void text_table_of_content::add_child_element( office_element_ptr & child_element)
void text_table_of_content::add_child_element( const office_element_ptr & child_element)
{
//if CP_CHECK_NAME(L"text", L"index-body")
{
......
ASCOfficeOdfFileW/source/OdfFormat/text_elements.h
View file @ e88e98a6
......@@ -39,7 +39,7 @@ public:
void add_text(const std::wstring & Text);
void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name,odf_conversion_context * context);
void add_child_element( office_element_ptr & child_element);
void add_child_element( const office_element_ptr & child_element);
void serialize (std::wostream & _Wostream);
void serialize_attr (CP_ATTR_NODE);
......@@ -62,7 +62,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -96,7 +96,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -124,7 +124,7 @@ public:
text_list(){};
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -150,7 +150,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name){}
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
};
......@@ -182,7 +182,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -222,7 +222,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element){}
virtual void add_child_element( const office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream);
......@@ -246,7 +246,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -272,7 +272,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......@@ -295,7 +295,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE()
virtual void create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name);
virtual void add_child_element( office_element_ptr & child_element);
virtual void add_child_element( const office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream);
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @ e88e98a6
......@@ -437,7 +437,7 @@ void DocxConverter::convert(OOX::Logic::CRun *oox_run)//wordprocessing 22.1.2.87
if (oox_run == NULL) return;
//test for break - 2 first element !!!
for(unsigned int i = 0; i < (std::min) (2,oox_run->m_arrItems.size()); ++i)
for(unsigned int i = 0; i < (std::min) ( (size_t)2, oox_run->m_arrItems.size()); ++i)
{
if (oox_run->m_arrItems[i]->getType() == OOX::et_w_lastRenderedPageBreak)
{
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp
View file @ e88e98a6
......@@ -518,9 +518,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::WritingElement *oox_unknown)
}break;
default:
{
std::wstringstream ss;
ss << L"[warning] : no convert element(" << oox_unknown->getType() << L")\n";
_CP_LOG(error) << ss.str();
_CP_LOG << L"[warning] : no convert element(" << oox_unknown->getType() << L")\n";
}
}
}
......
ASCOfficeOdfFileW/source/win32/OdfFormat.vcproj
View file @ e88e98a6
......@@ -1573,6 +1573,30 @@
<Filter
Name="xml_common"
>
<File
RelativePath="..\OdfFormat\abstract_xml.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\abstract_xml.h"
>
</File>
<File
RelativePath="..\OdfFormat\logging.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements.h"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements_create.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements_create.h"
>
</File>
<File
RelativePath="..\OdfFormat\svg_creator.cpp"
>
......@@ -1894,34 +1918,6 @@
>
</File>
</Filter>
<File
RelativePath="..\OdfFormat\abstract_xml.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\abstract_xml.h"
>
</File>
<File
RelativePath="..\OdfFormat\logging.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements.h"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements_create.cpp"
>
</File>
<File
RelativePath="..\OdfFormat\office_elements_create.h"
>
</File>
<File
RelativePath=".\utils.h"
>
</File>
</Files>
<Globals>
</Globals>
......
ASCOfficeOdfFileW/win32/ASCOfficeOdfFileW.h
View file @ e88e98a6
......@@ -3,35 +3,30 @@
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
/* File created by MIDL compiler version 6.00.0366 */
/* at Wed May 06 13:15:29 2015
/* File created by MIDL compiler version 7.00.0555 */
/* at Sun Jun 07 15:31:58 2015
*/
/* Compiler settings for .\ASCOfficeOdfFileW.idl:
Oicf, W1, Zp8, env=Win64 (32b run)
protocol : dce , ms_ext, c_ext, robust
Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
protocol : dce , ms_ext, c_ext
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
DECLSPEC_UUID(), MIDL_INTERFACE()
*/
//@@MIDL_FILE_HEADING( )
/* @@MIDL_FILE_HEADING( ) */
#pragma warning( disable: 4049 ) /* more than 64k source lines */
/* verify that the <rpcndr.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCNDR_H_VERSION__
#define __REQUIRED_RPCNDR_H_VERSION__ 475
#define __REQUIRED_RPCNDR_H_VERSION__ 440
#endif
#include "rpc.h"
#include "rpcndr.h"
#ifndef __RPCNDR_H_VERSION__
#error this stub requires an updated version of <rpcndr.h>
#endif // __RPCNDR_H_VERSION__
#ifndef __ASCOfficeOdfFileW_h__
#define __ASCOfficeOdfFileW_h__
......@@ -49,8 +44,6 @@
extern "C"{
#endif
void * __RPC_USER MIDL_user_allocate(size_t);
void __RPC_USER MIDL_user_free( void * );
#ifndef __ASCOfficeOdfFileWLib_LIBRARY_DEFINED__
......
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