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

x2t linux 64 build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@66740 954022d7-b5bf-4e40-9824-e11837661b57
parent 3bc2b920
...@@ -132,7 +132,7 @@ public: ...@@ -132,7 +132,7 @@ public:
static _CP_PTR(chart_content) create(); static _CP_PTR(chart_content) create();
std::wostream & content() { return content_; } std::wostream & content() { return content_; }
rels & rels() { return rels_file_->get_rels(); } rels & get_rels() { return rels_file_->get_rels(); }
std::wstring str() { return content_.str(); } std::wstring str() { return content_.str(); }
......
...@@ -41,7 +41,7 @@ private: ...@@ -41,7 +41,7 @@ private:
class rels; class rels;
typedef _CP_PTR(rels) rels_ptr; typedef _CP_PTR(rels) rels_ptr;
/// \class rels /// class rels
class rels class rels
{ {
public: public:
......
...@@ -157,7 +157,7 @@ void xlsx_conversion_context::end_document() ...@@ -157,7 +157,7 @@ void xlsx_conversion_context::end_document()
count++; count++;
package::chart_content_ptr content = package::chart_content::create(); package::chart_content_ptr content = package::chart_content::create();
chart->dump_rels(content->rels()); chart->dump_rels(content->get_rels());
chart->write_to(content->content()); chart->write_to(content->content());
output_document_->get_xl_files().add_charts(content); output_document_->get_xl_files().add_charts(content);
......
...@@ -254,7 +254,7 @@ void xl_charts_files::write(const std::wstring & RootPath) ...@@ -254,7 +254,7 @@ void xl_charts_files::write(const std::wstring & RootPath)
package::simple_element(fileName, item->str()).write(path); package::simple_element(fileName, item->str()).write(path);
if (item->rels().empty() == false) if (item->get_rels().empty() == false)
{ {
rels_files relFiles; rels_files relFiles;
item->rels_file_->set_file_name(fileName + L".rels"); item->rels_file_->set_file_name(fileName + L".rels");
......
...@@ -1606,7 +1606,8 @@ HEADERS += \ ...@@ -1606,7 +1606,8 @@ HEADERS += \
../XlsFormat/Auxiliary/HelpersTagsGenerator.h \ ../XlsFormat/Auxiliary/HelpersTagsGenerator.h \
../XlsFormat/Auxiliary/HelpFunc.h \ ../XlsFormat/Auxiliary/HelpFunc.h \
../XlsFormat/Logic/SummaryInformationStream/Structures/CodePageOle.h \ ../XlsFormat/Logic/SummaryInformationStream/Structures/CodePageOle.h \
../XlsFormat/Logic/Biff_structures/SharedProperty.h ../XlsFormat/Logic/Biff_structures/SharedProperty.h \
../XlsXlsxConverter/xlsx_chart_context.h
......
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