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

.....

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63325 954022d7-b5bf-4e40-9824-e11837661b57
parent 1f52b84d
......@@ -270,6 +270,15 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
}
bool is_empty= paragraph_content_.size()==0;
BOOST_FOREACH(const office_element_ptr & elm, paragraph_content_)
{
if (elm->get_type() == typeTextSoftPageBreak && !Context.check_page_break_after() && !Context.check_page_break_before() && !(next_section_ || next_end_section_))
{//1 (206).odt - soft-break
Context.add_page_break_before();
}
}
Context.start_paragraph();
std::wostream & _Wostream = Context.output_stream();
......@@ -334,6 +343,14 @@ void paragraph::docx_convert(oox::docx_conversion_context & Context)
if (Context.get_drop_cap_context().state() >0)
Context.get_drop_cap_context().state(0);//disable
if (elm->get_type() == typeTextSoftPageBreak && !Context.check_page_break_after() && !Context.check_page_break_before())
{
_Wostream << L"<w:lastRenderedPageBreak/>";
if (next_section_ || next_end_section_)
Context.add_page_break_before();
}
}
if (textStyle>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