Commit 435a11d7 authored by ElenaSubbotina's avatar ElenaSubbotina

.

parent 9a5329f5
...@@ -164,6 +164,11 @@ odf_table_context* odt_conversion_context::table_context() ...@@ -164,6 +164,11 @@ odf_table_context* odt_conversion_context::table_context()
return &table_context_; return &table_context_;
} }
odf_notes_context* odt_conversion_context::notes_context()
{
return &notes_context_;
}
odf_text_context* odt_conversion_context::text_context() odf_text_context* odt_conversion_context::text_context()
{ {
if (text_context_.size() > 0) if (text_context_.size() > 0)
......
...@@ -79,6 +79,7 @@ public: ...@@ -79,6 +79,7 @@ public:
odf_comment_context * comment_context(); odf_comment_context * comment_context();
odf_table_context * table_context(); odf_table_context * table_context();
odf_notes_context * notes_context();
void start_drawings (); void start_drawings ();
void end_drawings (); void end_drawings ();
......
...@@ -1293,6 +1293,15 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty *oox_paragraph_pr, cp ...@@ -1293,6 +1293,15 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty *oox_paragraph_pr, cp
} }
if (odt_context->notes_context()->is_started())
{
paragraph_properties->content_.fo_margin_left_ = odf_types::length( 0.5, odf_types::length::cm);
paragraph_properties->content_.fo_text_indent_ = odf_types::length(-0.5, odf_types::length::cm);
paragraph_properties->content_.fo_line_height_ = odf_types::percent(100.);
paragraph_properties->content_.style_auto_text_indent_ = false;
//loext:contextual-spacing="false"
}
if (oox_paragraph_pr->m_oTabs.IsInit()) if (oox_paragraph_pr->m_oTabs.IsInit())
{ {
paragraph_properties->add_child_element(odf_context()->start_tabs()); paragraph_properties->add_child_element(odf_context()->start_tabs());
......
<?xml version="1.0" encoding="windows-1251"?> <?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="Oox2OdfConverter" Name="Oox2OdfConverter"
ProjectGUID="{BEE01B53-244A-44E6-8947-ED9342D9247E}" ProjectGUID="{BEE01B53-244A-44E6-8947-ED9342D9247E}"
RootNamespace="Oox2OdfConverter" RootNamespace="Oox2OdfConverter"
......
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