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

(1.2.0.115): ASCOfficeOdfFileW


git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57617 954022d7-b5bf-4e40-9824-e11837661b57
parent aa09c791
......@@ -170,6 +170,8 @@ void odf_page_layout_context::set_footer_size(_CP_OPT(length) length_)//
style_page_layout_properties * props = get_properties();
if (!props)return;
length_ = length(length_->get_value_unit(length::cm),length::cm);
_CP_OPT(length) bottom_;
if (props->style_page_layout_properties_attlist_.common_vertical_margin_attlist_.fo_margin_bottom_)
......@@ -188,6 +190,8 @@ void odf_page_layout_context::set_header_size(_CP_OPT(length) length_)
style_page_layout_properties * props = get_properties();
if (!props)return;
length_ = length(length_->get_value_unit(length::cm),length::cm);
_CP_OPT(length) top_;
if (props->style_page_layout_properties_attlist_.common_vertical_margin_attlist_.fo_margin_top_)
......
......@@ -744,7 +744,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
if (oox_section_pr->m_arrHeaderReference[i].m_oId.IsInit())
{
convert_hdr_ftr(oox_section_pr->m_arrHeaderReference[i].m_oId->GetValue());
//convert(docx_document->GetDocument()->m_oBackground.GetPointer(), 2);
convert(docx_document->GetDocument()->m_oBackground.GetPointer(), 2);
}
odt_context->end_header_footer();
......@@ -758,7 +758,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
if (oox_section_pr->m_arrFooterReference[i].m_oId.IsInit())
{
convert_hdr_ftr(oox_section_pr->m_arrFooterReference[i].m_oId->GetValue());
//convert(docx_document->GetDocument()->m_oBackground.GetPointer(), 3);
convert(docx_document->GetDocument()->m_oBackground.GetPointer(), 3);
}
odt_context->end_header_footer();
......
......@@ -2,6 +2,6 @@
//1
//2
//0
//112
#define INTVER 1,2,0,112
#define STRVER "1,2,0,112\0"
//115
#define INTVER 1,2,0,115
#define STRVER "1,2,0,115\0"
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