Skip to content

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

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54935 954022d7-b5bf-4e40-9824-e11837661b57
parent 86af95cf
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 27 deletions
ASCOfficeOdfFileW/source/OdfFormat/object_package.cpp
View file @ 892470ad
......@@ -35,6 +35,10 @@ namespace odf
}
////////////
content_simple_ptr content_simple::create()
{
return boost::make_shared<content_simple>();
}
content_content_ptr content_content::create()
{
return boost::make_shared<content_content>();
......@@ -195,9 +199,9 @@ namespace odf
}
void object_files::set_content(content_content_ptr & _Content)
void object_files::set_content(content_content_ptr & _content)
{
content_.set_content(_Content);
content_.set_content(_content);
meta_ = element_ptr(new meta_file());
}
void object_files::set_media(mediaitems & _Mediaitems)
......@@ -208,17 +212,17 @@ namespace odf
{
pictures_ = element_ptr( new pictures(_Mediaitems) );
}
void object_files::set_styles(element_ptr Element)
void object_files::set_styles(content_simple_ptr & _content)
{
styles_ = Element;
styles_.set_content(_content);
}
void object_files::write(const std::wstring & RootPath)
{
content_.write(RootPath);
content_.write(RootPath);
styles_.write(RootPath);
if (meta_) meta_->write(RootPath);
if (styles_) styles_->write(RootPath);
if (media_) media_->write(RootPath);
if (pictures_) pictures_->write(RootPath);
}
......@@ -299,16 +303,18 @@ namespace odf
CP_XML_ATTR(L"xmlns:field", L"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" );
CP_XML_ATTR(L"xmlns:formx", L"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" );
CP_XML_ATTR(L"xmlns:css3t", L"http://www.w3.org/TR/css3-text/" );
CP_XML_ATTR(L"office:version", L"1.2");
CP_XML_ATTR(L"office:version", L"1.2");
CP_XML_NODE(L"office:scripts");
CP_XML_NODE(L"office:font-face-decls");
CP_XML_NODE(L"office:automatic-styles");
if (content_)
{
CP_XML_STREAM() << content_->styles_str();
}
CP_XML_NODE(L"office:body")
{
if (content_)
{
CP_XML_STREAM() << content_->str();
CP_XML_STREAM() << content_->content_str();
}
}
}
......@@ -317,6 +323,60 @@ namespace odf
simple_element elm(L"content.xml", resStream.str());
elm.write(RootPath);
}
void styles_file::write(const std::wstring & RootPath)
{
std::wstringstream resStream;
CP_XML_WRITER(resStream)
{
CP_XML_NODE(L"office:document-styles")
{
CP_XML_ATTR(L"xmlns:office",L"urn:oasis:names:tc:opendocument:xmlns:office:1.0" );
CP_XML_ATTR(L"xmlns:style", L"urn:oasis:names:tc:opendocument:xmlns:style:1.0" );
CP_XML_ATTR(L"xmlns:text", L"urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
CP_XML_ATTR(L"xmlns:table", L"urn:oasis:names:tc:opendocument:xmlns:table:1.0" );
CP_XML_ATTR(L"xmlns:draw", L"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" );
CP_XML_ATTR(L"xmlns:fo", L"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" );
CP_XML_ATTR(L"xmlns:xlink", L"http://www.w3.org/1999/xlink" );
CP_XML_ATTR(L"xmlns:dc", L"http://purl.org/dc/elements/1.1/" );
CP_XML_ATTR(L"xmlns:meta", L"urn:oasis:names:tc:opendocument:xmlns:meta:1.0" );
CP_XML_ATTR(L"xmlns:number",L"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" );
CP_XML_ATTR(L"xmlns:presentation", L"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" );
CP_XML_ATTR(L"xmlns:svg", L"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
CP_XML_ATTR(L"xmlns:chart", L"urn:oasis:names:tc:opendocument:xmlns:chart:1.0" );
CP_XML_ATTR(L"xmlns:dr3d", L"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" );
CP_XML_ATTR(L"xmlns:math", L"http://www.w3.org/1998/Math/MathML" );
CP_XML_ATTR(L"xmlns:form", L"urn:oasis:names:tc:opendocument:xmlns:form:1.0" );
CP_XML_ATTR(L"xmlns:script",L"urn:oasis:names:tc:opendocument:xmlns:script:1.0" );
CP_XML_ATTR(L"xmlns:ooo", L"http://openoffice.org/2004/office" );
CP_XML_ATTR(L"xmlns:ooow", L"http://openoffice.org/2004/writer" );
CP_XML_ATTR(L"xmlns:oooc", L"http://openoffice.org/2004/calc" );
CP_XML_ATTR(L"xmlns:dom", L"http://www.w3.org/2001/xml-events" );
CP_XML_ATTR(L"xmlns:xforms",L"http://www.w3.org/2002/xforms");
CP_XML_ATTR(L"xmlns:xsd", L"http://www.w3.org/2001/XMLSchema" );
CP_XML_ATTR(L"xmlns:xsi", L"http://www.w3.org/2001/XMLSchema-instance" );
CP_XML_ATTR(L"xmlns:rpt", L"http://openoffice.org/2005/report" );
CP_XML_ATTR(L"xmlns:of", L"urn:oasis:names:tc:opendocument:xmlns:of:1.2" );
CP_XML_ATTR(L"xmlns:xhtml", L"http://www.w3.org/1999/xhtml" );
CP_XML_ATTR(L"xmlns:grddl", L"http://www.w3.org/2003/g/data-view#" );
CP_XML_ATTR(L"xmlns:tableooo", L"http://openoffice.org/2009/table" );
CP_XML_ATTR(L"xmlns:drawooo", L"http://openoffice.org/2010/draw" );
CP_XML_ATTR(L"xmlns:calcext", L"urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" );
CP_XML_ATTR(L"xmlns:field", L"urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" );
CP_XML_ATTR(L"xmlns:formx", L"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" );
CP_XML_ATTR(L"xmlns:css3t", L"http://www.w3.org/TR/css3-text/" );
CP_XML_ATTR(L"office:version", L"1.2");
if (content_)
{
CP_XML_STREAM() << content_->str();
}
}
}
simple_element elm(L"styles.xml", resStream.str());
elm.write(RootPath);
}
}
}
......
ASCOfficeOdfFileW/source/OdfFormat/object_package.h
View file @ 892470ad
......@@ -20,6 +20,21 @@ namespace odf
typedef shared_ptr<element>::Type element_ptr;
typedef std::vector<element_ptr> element_ptr_array;
class content_simple;
typedef _CP_PTR(content_simple) content_simple_ptr;
class content_simple : noncopyable
{
public:
content_simple(){}
std::wostream & content() { return content_; }
std::wstring str() { return content_.str(); }
static _CP_PTR(content_simple) create();
private:
std::wstringstream content_;
};
class content_content;
typedef _CP_PTR(content_content) content_content_ptr;
......@@ -28,13 +43,16 @@ namespace odf
public:
content_content(){}
std::wostream & content() { return content_; }
std::wstring str() { return content_.str(); }
std::wostream & styles() { return styles_; }
std::wstring content_str() { return content_.str(); }
std::wstring styles_str() { return styles_.str(); }
static _CP_PTR(content_content) create();
private:
std::wstringstream content_;
std::wstringstream styles_;
};
class element
{
public:
......@@ -75,15 +93,18 @@ namespace odf
class content_file : public element
{
public:
void set_content(content_content_ptr & c) {content_ = c;}
void set_content(content_content_ptr & c){content_ = c;}
virtual void write(const std::wstring & RootPath);
content_content_ptr content_;
};
class styles_file : public element
{
public:
void set_content(content_simple_ptr & c) {content_ = c;}
virtual void write(const std::wstring & RootPath);
content_simple_ptr content_;
};
class manifect_file : public element
......@@ -137,18 +158,18 @@ namespace odf
void set_content(content_content_ptr & _Content);
void set_styles (content_simple_ptr & _Styles);
void set_media(mediaitems & _Mediaitems);
void set_pictures(mediaitems & _Mediaitems);
void set_styles(element_ptr Element);
virtual void write(const std::wstring & RootPath);
private:
content_file content_;
content_file content_;
styles_file styles_;
element_ptr styles_;
element_ptr meta_;
element_ptr media_;
element_ptr pictures_;
};
......
ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.cpp
View file @ 892470ad
......@@ -52,25 +52,23 @@ void odf_conversion_context::end_document()
//////////////////////////////////////////////////////////////////////
package::content_content_ptr content_root_ = package::content_content::create();
BOOST_FOREACH(const office_element_ptr & elm, content_)
{
elm->serialize(content_root_->content());
}
std::wstringstream styles_root_strm;
//////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////
package::content_simple_ptr content_style_ = package::content_simple::create();
BOOST_FOREACH(const office_element_ptr & elm, styles_)
{// ìàñòåð-ïåéäæû, çàäàííûå çàëèâêè (ãðàäèåíòû, áèòìàïû), äåôîëòíûå ñòèëè, êîëîíòèòóëû, ðàçìåòêè, çàìåòêè,...
elm->serialize(styles_root_strm);
elm->serialize(content_style_->content());
}
////////////////////////////////////////////////////////////////////////////////////////////////////
package::object_files *object_files = new package::object_files();
if (object_files)
{
object_files->set_content(content_root_);
object_files->set_styles(package::simple_element::create(L"styles.xml", styles_root_strm.str()));
object_files->set_styles(content_style_);
output_document_->add_object(package::element_ptr(object_files ),true);
......
ASCOfficeOdfFileW/source/OdfFormat/styles.cpp
View file @ 892470ad
......@@ -484,12 +484,16 @@ void office_master_styles::serialize(std::wostream & strm)
{
CP_XML_NODE_SIMPLE()
{
draw_layer_set_->serialize(CP_XML_STREAM());
if (draw_layer_set_)
draw_layer_set_->serialize(CP_XML_STREAM());
BOOST_FOREACH(office_element_ptr elm, style_master_page_)
{
elm->serialize(CP_XML_STREAM());
}
style_handout_master_->serialize(CP_XML_STREAM());
if (style_handout_master_)
style_handout_master_->serialize(CP_XML_STREAM());
}
}
......
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