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

git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54933 954022d7-b5bf-4e40-9824-e11837661b57
parent 24e5680e
...@@ -19,7 +19,7 @@ void abstract_xml::serialize(std::wostream & strm) ...@@ -19,7 +19,7 @@ void abstract_xml::serialize(std::wostream & strm)
{ {
} }
//void abstract_xml::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) //void abstract_xml::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
//{ //{
// CP_CREATE_ELEMENT(xml_content_); // CP_CREATE_ELEMENT(xml_content_);
//} //}
......
...@@ -19,7 +19,7 @@ public: ...@@ -19,7 +19,7 @@ public:
abstract_xml() {}; abstract_xml() {};
private: private:
virtual void add_child_element( const std::wstring & Ns, const std::wstring & 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( office_element_ptr & child_element);
virtual void serialize(std::wostream & strm); virtual void serialize(std::wostream & strm);
......
...@@ -13,7 +13,7 @@ const wchar_t * style_header_footer_properties::ns = L"style"; ...@@ -13,7 +13,7 @@ const wchar_t * style_header_footer_properties::ns = L"style";
const wchar_t * style_header_footer_properties::name = L"header-footer-properties"; const wchar_t * style_header_footer_properties::name = L"header-footer-properties";
void style_header_footer_properties::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_header_footer_properties::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"style" == Ns && L"background-image" == Name) if (L"style" == Ns && L"background-image" == Name)
{ {
...@@ -25,7 +25,7 @@ void style_header_footer_properties::add_child_element( const ::std::wstring & ...@@ -25,7 +25,7 @@ void style_header_footer_properties::add_child_element( const ::std::wstring &
} }
} }
void header_footer_content::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context) void header_footer_content::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context)
{ {
CP_CREATE_ELEMENT_SIMPLE(content_); CP_CREATE_ELEMENT_SIMPLE(content_);
} }
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
static const ElementType type = typeStyleHeaderFooterProperties; static const ElementType type = typeStyleHeaderFooterProperties;
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
class header_footer_content class header_footer_content
{ {
public: public:
void add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context); 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(office_element_ptr & child);
office_element_ptr_array content_; office_element_ptr_array content_;
......
...@@ -88,7 +88,7 @@ void odf_conversion_context::add_rel(relationship const & r) ...@@ -88,7 +88,7 @@ void odf_conversion_context::add_rel(relationship const & r)
void odf_conversion_context::process_styles() void odf_conversion_context::process_styles()
{ {
create_element(L"office", L"office-styles", styles_, this,true); create_element(L"office", L"styles", styles_, this,true);
style_context_.process_office(styles_.back()); style_context_.process_office(styles_.back());
create_element(L"office", L"automatic-styles", styles_, this,true); create_element(L"office", L"automatic-styles", styles_, this,true);
......
...@@ -21,7 +21,7 @@ const wchar_t * office_body::name = L"body"; ...@@ -21,7 +21,7 @@ const wchar_t * office_body::name = L"body";
office_body::office_body() office_body::office_body()
{} {}
void office_body::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void office_body::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
CP_CREATE_ELEMENT(content_); CP_CREATE_ELEMENT(content_);
} }
......
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
public: public:
office_body(); office_body();
virtual void add_child_element( const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream); virtual void serialize(std::wostream & _Wostream);
......
...@@ -19,7 +19,7 @@ namespace odf { ...@@ -19,7 +19,7 @@ namespace odf {
const wchar_t * office_spreadsheet::ns = L"office"; const wchar_t * office_spreadsheet::ns = L"office";
const wchar_t * office_spreadsheet::name = L"spreadsheet"; const wchar_t * office_spreadsheet::name = L"spreadsheet";
void office_spreadsheet::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name) void office_spreadsheet::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
CP_CREATE_ELEMENT(content_); CP_CREATE_ELEMENT(content_);
} }
......
...@@ -27,7 +27,7 @@ public: ...@@ -27,7 +27,7 @@ public:
office_element_ptr_array & getContent(){return content_;} office_element_ptr_array & getContent(){return content_;}
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element);
virtual void serialize(std::wostream & _Wostream); virtual void serialize(std::wostream & _Wostream);
......
...@@ -16,7 +16,7 @@ namespace odf { ...@@ -16,7 +16,7 @@ namespace odf {
const wchar_t * style_map::ns = L"style"; const wchar_t * style_map::ns = L"style";
const wchar_t * style_map::name = L"map"; const wchar_t * style_map::name = L"map";
void style_map::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_map::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
CP_NOT_APPLICABLE_ELM(); CP_NOT_APPLICABLE_ELM();
} }
......
...@@ -24,7 +24,7 @@ public: ...@@ -24,7 +24,7 @@ public:
static const ElementType type = typeStyleMap; static const ElementType type = typeStyleMap;
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
......
...@@ -11,7 +11,7 @@ namespace odf { ...@@ -11,7 +11,7 @@ namespace odf {
using xml::xml_char_wc; using xml::xml_char_wc;
bool table_format_properties::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context) bool table_format_properties::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context)
{ {
if (L"style" == Ns && L"background-image" == Name) if (L"style" == Ns && L"background-image" == Name)
{ {
...@@ -62,9 +62,9 @@ const wchar_t * style_table_properties::ns = L"style"; ...@@ -62,9 +62,9 @@ const wchar_t * style_table_properties::ns = L"style";
const wchar_t * style_table_properties::name = L"table-properties"; const wchar_t * style_table_properties::name = L"table-properties";
void style_table_properties::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name) void style_table_properties::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
table_format_properties_.add_child_element(Ns, Name, getContext()); table_format_properties_.create_child_element(Ns, Name, getContext());
} }
void style_table_properties::serialize(std::wostream & _Wostream) void style_table_properties::serialize(std::wostream & _Wostream)
...@@ -86,7 +86,7 @@ void style_table_properties::serialize(std::wostream & _Wostream) ...@@ -86,7 +86,7 @@ void style_table_properties::serialize(std::wostream & _Wostream)
const wchar_t * style_table_column_properties::ns = L"style"; const wchar_t * style_table_column_properties::ns = L"style";
const wchar_t * style_table_column_properties::name = L"table-column-properties"; const wchar_t * style_table_column_properties::name = L"table-column-properties";
void style_table_column_properties::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_table_column_properties::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
CP_NOT_APPLICABLE_ELM(); CP_NOT_APPLICABLE_ELM();
} }
...@@ -101,7 +101,7 @@ const wchar_t * style_table_cell_properties::name = L"table-cell-properties"; ...@@ -101,7 +101,7 @@ const wchar_t * style_table_cell_properties::name = L"table-cell-properties";
void style_table_cell_properties::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_table_cell_properties::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"style" == Ns && L"background-image" == Name) if (L"style" == Ns && L"background-image" == Name)
{ {
...@@ -122,7 +122,7 @@ const wchar_t * style_table_row_properties::ns = L"style"; ...@@ -122,7 +122,7 @@ const wchar_t * style_table_row_properties::ns = L"style";
const wchar_t * style_table_row_properties::name = L"table-row-properties"; const wchar_t * style_table_row_properties::name = L"table-row-properties";
void style_table_row_properties::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_table_row_properties::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"style" == Ns && L"background-image" == Name) if (L"style" == Ns && L"background-image" == Name)
{ {
......
...@@ -28,7 +28,7 @@ namespace odf { ...@@ -28,7 +28,7 @@ namespace odf {
class table_format_properties class table_format_properties
{ {
public: public:
bool add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context); bool create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name, odf_conversion_context * Context);
void serialize(std::wostream & strm); void serialize(std::wostream & strm);
private: private:
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -140,7 +140,7 @@ public: ...@@ -140,7 +140,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
...@@ -250,7 +250,7 @@ public: ...@@ -250,7 +250,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
......
This diff is collapsed.
...@@ -18,7 +18,7 @@ const wchar_t * text_list_style::ns = L"text"; ...@@ -18,7 +18,7 @@ const wchar_t * text_list_style::ns = L"text";
const wchar_t * text_list_style::name = L"list-style"; const wchar_t * text_list_style::name = L"list-style";
void text_list_style::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void text_list_style::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"text" == Ns && L"list-level-style-number" == Name) if (L"text" == Ns && L"list-level-style-number" == Name)
CP_CREATE_ELEMENT(text_list_style_content_); CP_CREATE_ELEMENT(text_list_style_content_);
...@@ -37,7 +37,7 @@ const wchar_t * text_list_level_style_number::ns = L"text"; ...@@ -37,7 +37,7 @@ const wchar_t * text_list_level_style_number::ns = L"text";
const wchar_t * text_list_level_style_number::name = L"list-level-style-number"; const wchar_t * text_list_level_style_number::name = L"list-level-style-number";
void text_list_level_style_number::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name) void text_list_level_style_number::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"style" == Ns && L"list-level-properties" == Name) if (L"style" == Ns && L"list-level-properties" == Name)
CP_CREATE_ELEMENT(style_list_level_properties_); CP_CREATE_ELEMENT(style_list_level_properties_);
...@@ -55,7 +55,7 @@ const wchar_t * style_list_level_properties::ns = L"style"; ...@@ -55,7 +55,7 @@ const wchar_t * style_list_level_properties::ns = L"style";
const wchar_t * style_list_level_properties::name = L"list-level-properties"; const wchar_t * style_list_level_properties::name = L"list-level-properties";
void style_list_level_properties::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void style_list_level_properties::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if CP_CHECK_NAME(L"style", L"list-level-label-alignment") if CP_CHECK_NAME(L"style", L"list-level-label-alignment")
{ {
...@@ -74,7 +74,7 @@ const wchar_t * style_list_level_label_alignment::name = L"list-level-label-alig ...@@ -74,7 +74,7 @@ const wchar_t * style_list_level_label_alignment::name = L"list-level-label-alig
void style_list_level_label_alignment::add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name) void style_list_level_label_alignment::create_child_element(const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
CP_NOT_APPLICABLE_ELM(); CP_NOT_APPLICABLE_ELM();
} }
...@@ -85,7 +85,7 @@ const wchar_t * text_list_level_style_bullet::ns = L"text"; ...@@ -85,7 +85,7 @@ const wchar_t * text_list_level_style_bullet::ns = L"text";
const wchar_t * text_list_level_style_bullet::name = L"list-level-style-bullet"; const wchar_t * text_list_level_style_bullet::name = L"list-level-style-bullet";
void text_list_level_style_bullet::add_child_element( const ::std::wstring & Ns, const ::std::wstring & Name) void text_list_level_style_bullet::create_child_element( const ::std::wstring & Ns, const ::std::wstring & Name)
{ {
if (L"style" == Ns && L"list-level-properties" == Name) if (L"style" == Ns && L"list-level-properties" == Name)
CP_CREATE_ELEMENT(style_list_level_properties_); CP_CREATE_ELEMENT(style_list_level_properties_);
......
...@@ -43,7 +43,7 @@ public: ...@@ -43,7 +43,7 @@ public:
const std::wstring & get_style_name() { return text_list_style_attr_.get_style_name(); } const std::wstring & get_style_name() { return text_list_style_attr_.get_style_name(); }
office_element_ptr_array & get_content() { return text_list_style_content_; } office_element_ptr_array & get_content() { return text_list_style_content_; }
virtual void add_child_element( const std::wstring & Ns, const std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
static const ElementType type = typeStyleListLevelProperties; static const ElementType type = typeStyleListLevelProperties;
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const std::wstring & Ns, const std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
static const ElementType type = typeStyleListLevelLabelAlignment; static const ElementType type = typeStyleListLevelLabelAlignment;
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const std::wstring & Ns, const std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -169,7 +169,7 @@ public: ...@@ -169,7 +169,7 @@ public:
office_element_ptr style_list_level_properties_; office_element_ptr style_list_level_properties_;
virtual void add_child_element( const std::wstring & Ns, const std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
...@@ -211,7 +211,8 @@ public: ...@@ -211,7 +211,8 @@ public:
office_element_ptr style_list_level_properties_; office_element_ptr style_list_level_properties_;
virtual void add_child_element( const std::wstring & Ns, const std::wstring & Name); 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(office_element_ptr & child)
{std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();} {std::wstringstream str; str <<L"Non add child in "; str << ns; str << L":"; str <<name; _CP_LOG(error) << str.str();}
virtual void serialize(std::wostream & strm){} virtual void serialize(std::wostream & strm){}
......
...@@ -112,7 +112,7 @@ public: ...@@ -112,7 +112,7 @@ public:
table_table_source_attlist table_table_source_attlist_; table_table_source_attlist table_table_source_attlist_;
table_linked_source_attlist table_linked_source_attlist_; table_linked_source_attlist table_linked_source_attlist_;
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -125,7 +125,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_source); ...@@ -125,7 +125,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_source);
class table_columns class table_columns
{ {
public: public:
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -151,7 +151,7 @@ public: ...@@ -151,7 +151,7 @@ public:
public: public:
table_columns_no_group(); table_columns_no_group();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -174,7 +174,7 @@ class table_columns_and_groups ...@@ -174,7 +174,7 @@ class table_columns_and_groups
public: public:
table_columns_and_groups(); table_columns_and_groups();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -210,7 +210,7 @@ public: ...@@ -210,7 +210,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -235,7 +235,7 @@ public: ...@@ -235,7 +235,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -259,7 +259,7 @@ public: ...@@ -259,7 +259,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -290,7 +290,7 @@ public: ...@@ -290,7 +290,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -319,7 +319,7 @@ public: ...@@ -319,7 +319,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -336,7 +336,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_row); ...@@ -336,7 +336,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_row);
class table_table_cell_content class table_table_cell_content
{ {
public: public:
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -362,7 +362,7 @@ public: ...@@ -362,7 +362,7 @@ public:
table_table_cell() { } table_table_cell() { }
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -390,7 +390,7 @@ public: ...@@ -390,7 +390,7 @@ public:
table_covered_table_cell() {empty_ = true; } table_covered_table_cell() {empty_ = true; }
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -416,7 +416,7 @@ public: ...@@ -416,7 +416,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -444,7 +444,7 @@ public: ...@@ -444,7 +444,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -460,7 +460,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_header_rows); ...@@ -460,7 +460,7 @@ CP_REGISTER_OFFICE_ELEMENT2(table_table_header_rows);
class table_rows class table_rows
{ {
public: public:
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -487,7 +487,7 @@ public: ...@@ -487,7 +487,7 @@ public:
public: public:
table_rows_no_group(); table_rows_no_group();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -508,7 +508,7 @@ class table_rows_and_groups ...@@ -508,7 +508,7 @@ class table_rows_and_groups
public: public:
table_rows_and_groups(); table_rows_and_groups();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & Name, 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -545,7 +545,7 @@ public: ...@@ -545,7 +545,7 @@ public:
table_table_row_group() table_table_row_group()
{ {
} }
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
...@@ -570,7 +570,7 @@ public: ...@@ -570,7 +570,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream); virtual void serialize(std::wostream & _Wostream);
...@@ -601,7 +601,7 @@ public: ...@@ -601,7 +601,7 @@ public:
CPDOCCORE_DEFINE_VISITABLE(); CPDOCCORE_DEFINE_VISITABLE();
virtual void add_child_element(const ::std::wstring & Ns, const ::std::wstring & 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( office_element_ptr & child_element){}
virtual void serialize(std::wostream & _Wostream){} virtual void serialize(std::wostream & _Wostream){}
......
...@@ -150,7 +150,7 @@ void XlsxConverter::convert_styles() ...@@ -150,7 +150,7 @@ void XlsxConverter::convert_styles()
} }
odf::office_element_ptr & XlsxConverter::convert(OOX::Spreadsheet::CFont * font) odf::office_element_ptr XlsxConverter::convert(OOX::Spreadsheet::CFont * font)
{ {
odf::office_element_ptr element; odf::office_element_ptr element;
return element; return element;
......
...@@ -46,6 +46,6 @@ namespace Oox2Odf ...@@ -46,6 +46,6 @@ namespace Oox2Odf
void convert(OOX::Spreadsheet::CWorksheet *oox_sheet); void convert(OOX::Spreadsheet::CWorksheet *oox_sheet);
cpdoccore::odf::office_element_ptr & convert(OOX::Spreadsheet::CFont * font); cpdoccore::odf::office_element_ptr convert(OOX::Spreadsheet::CFont * font);
}; };
} }
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment